Add unit test for tempest run --config-file
This commit adds a unit test for `tempest run --config-file`. That
if block was not tested in the gate. And an issue occurs like
this[0]. And this commit fixes a couple of issue in run.py through
adding this test.
[0] https://review.openstack.org/#/c/546822/
Change-Id: I235b822d802cf27d2dc43b35f85802d3a214b1b5
diff --git a/tempest/cmd/run.py b/tempest/cmd/run.py
index b8ae2ff..72ee715 100644
--- a/tempest/cmd/run.py
+++ b/tempest/cmd/run.py
@@ -153,7 +153,7 @@
if not os.path.isfile('.stestr.conf'):
self._create_stestr_conf()
# local execution with config file mode
- elif parsed_args.config_file:
+ elif parsed_args.config_file and not os.path.isfile('.stestr.conf'):
self._create_stestr_conf()
elif not os.path.isfile('.stestr.conf'):
print("No .stestr.conf file was found for local execution")
@@ -164,6 +164,7 @@
pass
regex = self._build_regex(parsed_args)
+ return_code = 0
if parsed_args.list_tests:
return_code = commands.list_command(
filters=regex, whitelist_file=parsed_args.whitelist_file,
diff --git a/tempest/tests/cmd/test_run.py b/tempest/tests/cmd/test_run.py
index bc10eb7..6cc356e 100644
--- a/tempest/tests/cmd/test_run.py
+++ b/tempest/tests/cmd/test_run.py
@@ -140,6 +140,11 @@
self.assertRunExit(['tempest', 'run', '--whitelist-file=%s' % path,
'--regex', 'fail'], 1)
+ def test_tempest_run_passes_with_config_file(self):
+ self.assertRunExit(['tempest', 'run',
+ '--config-file', self.stestr_conf_file,
+ '--regex', 'passing'], 0)
+
class TestTakeAction(base.TestCase):
def test_workspace_not_registered(self):
@@ -168,3 +173,27 @@
self.assertRaises(Exception_, tempest_run.take_action, parsed_args)
exit_msg = m_exit.call_args[0][0]
self.assertIn(workspace, exit_msg)
+
+ def test_config_file_specified(self):
+ # Setup test dirs
+ self.directory = tempfile.mkdtemp(prefix='tempest-unit')
+ self.addCleanup(shutil.rmtree, self.directory)
+ self.test_dir = os.path.join(self.directory, 'tests')
+ os.mkdir(self.test_dir)
+ # Change directory, run wrapper and check result
+ self.addCleanup(os.chdir, os.path.abspath(os.curdir))
+ os.chdir(self.directory)
+
+ tempest_run = run.TempestRun(app=mock.Mock(), app_args=mock.Mock())
+ parsed_args = mock.Mock()
+ parsed_args.config_file = []
+
+ parsed_args.workspace = None
+ parsed_args.state = None
+ parsed_args.list_tests = False
+ parsed_args.config_file = '.stestr.conf'
+
+ with mock.patch('stestr.commands.run_command') as m:
+ m.return_value = 0
+ self.assertEqual(0, tempest_run.take_action(parsed_args))
+ m.assert_called()