Merge pull request #33740 from lxbsz/qa_test_timeout_failed

qa/test_config_session_timeout: fix options conflicting

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
This commit is contained in:
Gregory Farnum 2020-03-27 12:55:20 -07:00 committed by GitHub
commit ca24037277
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -333,7 +333,7 @@ class LocalRemote(object):
# Filter out helper tools that don't exist in a vstart environment
args = [a for a in args if a not in {
'adjust-ulimits', 'ceph-coverage', 'timeout'}]
'adjust-ulimits', 'ceph-coverage'}]
# Adjust binary path prefix if given a bare program name
if "/" not in args[0]: