Remove concurrency workaround
After we bumped tempest version used in refstack to the commit from Oct 2019 [1], we can remove concurrency workaround which was needed only until the tempest version used in refstack doesn't contain this commit [2] which is from Mar 2019. [1] https://review.opendev.org/c/osf/refstack-client/+/782592 [2] https://review.opendev.org/c/openstack/tempest/+/641349 Change-Id: I17d5df4635b0451e4442ef693f4293ee3851ff6d
This commit is contained in:
parent
a842efbf56
commit
d9924541d8
@ -525,13 +525,6 @@ class RefstackClient:
|
|||||||
cmd = [wrapper, 'tempest', 'run']
|
cmd = [wrapper, 'tempest', 'run']
|
||||||
if not self.args.parallel:
|
if not self.args.parallel:
|
||||||
cmd.append('--serial')
|
cmd.append('--serial')
|
||||||
# TODO(mkopec) until refstack-client uses tempest tag which contains
|
|
||||||
# the following change https://review.openstack.org/#/c/641349/
|
|
||||||
# let's hardcode concurrency here, when the change is merged, the
|
|
||||||
# value of concurrency will be set as default in tempest so the
|
|
||||||
# following two lines can be deleted
|
|
||||||
cmd.append('--concurrency')
|
|
||||||
cmd.append('0')
|
|
||||||
# If a test list was specified, have it take precedence.
|
# If a test list was specified, have it take precedence.
|
||||||
if self.args.test_list:
|
if self.args.test_list:
|
||||||
self.logger.info("Normalizing test list...")
|
self.logger.info("Normalizing test list...")
|
||||||
|
@ -566,8 +566,7 @@ class TestRefstackClient(unittest.TestCase):
|
|||||||
|
|
||||||
mock_popen.assert_called_with(
|
mock_popen.assert_called_with(
|
||||||
['%s/tools/with_venv.sh' % self.test_path, 'tempest', 'run',
|
['%s/tools/with_venv.sh' % self.test_path, 'tempest', 'run',
|
||||||
'--serial', '--concurrency', '0', '--regex',
|
'--serial', '--regex', 'tempest.api.compute'],
|
||||||
'tempest.api.compute'],
|
|
||||||
stderr=None
|
stderr=None
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -598,8 +597,7 @@ class TestRefstackClient(unittest.TestCase):
|
|||||||
client.test()
|
client.test()
|
||||||
mock_popen.assert_called_with(
|
mock_popen.assert_called_with(
|
||||||
['%s/tools/with_venv.sh' % self.test_path, 'tempest', 'run',
|
['%s/tools/with_venv.sh' % self.test_path, 'tempest', 'run',
|
||||||
'--serial', '--concurrency', '0', '--regex',
|
'--serial', '--regex', 'tempest.api.compute'],
|
||||||
'tempest.api.compute'],
|
|
||||||
stderr=None
|
stderr=None
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -632,8 +630,7 @@ class TestRefstackClient(unittest.TestCase):
|
|||||||
client.test()
|
client.test()
|
||||||
mock_popen.assert_called_with(
|
mock_popen.assert_called_with(
|
||||||
['%s/tools/with_venv.sh' % self.test_path, 'tempest', 'run',
|
['%s/tools/with_venv.sh' % self.test_path, 'tempest', 'run',
|
||||||
'--serial', '--concurrency', '0', '--regex',
|
'--serial', '--regex', 'tempest.api.compute'],
|
||||||
'tempest.api.compute'],
|
|
||||||
stderr=None
|
stderr=None
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -679,8 +676,7 @@ class TestRefstackClient(unittest.TestCase):
|
|||||||
# https://review.opendev.org/c/openstack/tempest/+/768583
|
# https://review.opendev.org/c/openstack/tempest/+/768583
|
||||||
mock_popen.assert_called_with(
|
mock_popen.assert_called_with(
|
||||||
['%s/tools/with_venv.sh' % self.test_path, 'tempest', 'run',
|
['%s/tools/with_venv.sh' % self.test_path, 'tempest', 'run',
|
||||||
'--serial', '--concurrency', '0', '--whitelist_file',
|
'--serial', '--whitelist_file', '/tmp/some-list'],
|
||||||
'/tmp/some-list'],
|
|
||||||
stderr=None
|
stderr=None
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -740,8 +736,7 @@ class TestRefstackClient(unittest.TestCase):
|
|||||||
|
|
||||||
mock_popen.assert_called_with(
|
mock_popen.assert_called_with(
|
||||||
['%s/tools/with_venv.sh' % self.test_path, 'tempest', 'run',
|
['%s/tools/with_venv.sh' % self.test_path, 'tempest', 'run',
|
||||||
'--serial', '--concurrency', '0', '--regex',
|
'--serial', '--regex', 'tempest.api.compute'],
|
||||||
'tempest.api.compute'],
|
|
||||||
stderr=None
|
stderr=None
|
||||||
)
|
)
|
||||||
# Since '1' is in the next-stream file, we expect the JSON output file
|
# Since '1' is in the next-stream file, we expect the JSON output file
|
||||||
|
Loading…
Reference in New Issue
Block a user