From 1bc06aac191b15b7d19987744a3b375e4af39b3b Mon Sep 17 00:00:00 2001 From: Divyansh Acharya Date: Fri, 18 Aug 2017 15:09:46 +0000 Subject: [PATCH] Added unit tests for blacklist and whitelist Change-Id: I226b44e90ff634fe2efb91aa9489262effcd8838 Closes-Bug: #1711651 --- tempest/tests/cmd/test_run.py | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/tempest/tests/cmd/test_run.py b/tempest/tests/cmd/test_run.py index 7ac347dea2..6e1250f449 100644 --- a/tempest/tests/cmd/test_run.py +++ b/tempest/tests/cmd/test_run.py @@ -13,6 +13,7 @@ # under the License. import argparse +import atexit import os import shutil import subprocess @@ -25,6 +26,7 @@ from tempest.cmd import run from tempest.tests import base DEVNULL = open(os.devnull, 'wb') +atexit.register(DEVNULL.close) class TestTempestRun(base.TestCase): @@ -68,6 +70,34 @@ class TestTempestRun(base.TestCase): self.assertEqual('i_am_a_fun_little_regex', self.run_cmd._build_regex(args)) + def test__build_whitelist_file(self): + args = mock.Mock(spec=argparse.Namespace) + setattr(args, 'smoke', False) + setattr(args, 'regex', None) + self.tests = tempfile.NamedTemporaryFile( + prefix='whitelist', delete=False) + self.tests.write(b"volume \n compute") + self.tests.close() + setattr(args, 'whitelist_file', self.tests.name) + setattr(args, 'blacklist_file', None) + self.assertEqual("volume|compute", + self.run_cmd._build_regex(args)) + os.unlink(self.tests.name) + + def test__build_blacklist_file(self): + args = mock.Mock(spec=argparse.Namespace) + setattr(args, 'smoke', False) + setattr(args, 'regex', None) + self.tests = tempfile.NamedTemporaryFile( + prefix='blacklist', delete=False) + self.tests.write(b"volume \n compute") + self.tests.close() + setattr(args, 'whitelist_file', None) + setattr(args, 'blacklist_file', self.tests.name) + self.assertEqual("^((?!compute|volume).)*$", + self.run_cmd._build_regex(args)) + os.unlink(self.tests.name) + class TestRunReturnCode(base.TestCase): def setUp(self):