openinfra/refstack-client
Code Issues Proposed changes

Remove concurrency workaround

Browse Source 
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:
Martin Kopec 2021-04-18 15:09:42 +00:00
parent a842efbf56
commit d9924541d8
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
refstack_client/refstack_client.py
View File

@ -525,13 +525,6 @@ class RefstackClient:
cmd = [wrapper, 'tempest', 'run']
if not self.args.parallel:
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 self.args.test_list:
self.logger.info("Normalizing test list...")

15
refstack_client/tests/unit/test_client.py
View File

@ -566,8 +566,7 @@ class TestRefstackClient(unittest.TestCase):
mock_popen.assert_called_with(
['%s/tools/with_venv.sh' % self.test_path, 'tempest', 'run',
'--serial', '--concurrency', '0', '--regex',
'tempest.api.compute'],
'--serial', '--regex', 'tempest.api.compute'],
stderr=None
)
@ -598,8 +597,7 @@ class TestRefstackClient(unittest.TestCase):
client.test()
mock_popen.assert_called_with(
['%s/tools/with_venv.sh' % self.test_path, 'tempest', 'run',
'--serial', '--concurrency', '0', '--regex',
'tempest.api.compute'],
'--serial', '--regex', 'tempest.api.compute'],
stderr=None
)
@ -632,8 +630,7 @@ class TestRefstackClient(unittest.TestCase):
client.test()
mock_popen.assert_called_with(
['%s/tools/with_venv.sh' % self.test_path, 'tempest', 'run',
'--serial', '--concurrency', '0', '--regex',
'tempest.api.compute'],
'--serial', '--regex', 'tempest.api.compute'],
stderr=None
)
@ -679,8 +676,7 @@ class TestRefstackClient(unittest.TestCase):
# https://review.opendev.org/c/openstack/tempest/+/768583
mock_popen.assert_called_with(
['%s/tools/with_venv.sh' % self.test_path, 'tempest', 'run',
'--serial', '--concurrency', '0', '--whitelist_file',
'/tmp/some-list'],
'--serial', '--whitelist_file', '/tmp/some-list'],
stderr=None
)
@ -740,8 +736,7 @@ class TestRefstackClient(unittest.TestCase):
mock_popen.assert_called_with(
['%s/tools/with_venv.sh' % self.test_path, 'tempest', 'run',
'--serial', '--concurrency', '0', '--regex',
'tempest.api.compute'],
'--serial', '--regex', 'tempest.api.compute'],
stderr=None
)
# Since '1' is in the next-stream file, we expect the JSON output file