Extend base_job_unittest for support subtest change

Signed-off-by: Jiri Zupka <jzupka@redhat.com>


git-svn-id: svn://test.kernel.org/autotest/trunk@5422 592f7852-d20e-0410-864c-8624ca9c26a4

1 files changed, 20 insertions, 0 deletions

diff --git a/client/common_lib/base_job_unittest.py b/client/common_lib/base_job_unittest.py
index 503b62cc..b98b01d3 100755
--- a/client/common_lib/base_job_unittest.py
+++ b/client/common_lib/base_job_unittest.py
@@ -1334,6 +1334,26 @@ class test_job_tags(unittest.TestCase):
         self.assertEqual(expected, actual)
 
 
+    def test_subtest_with_master_test_path_and_subdir(self):
+        self.assertEqual(
+            ('test9', 'subtestdir/test9.subdirtag', 'subdirtag'),
+            self.job._build_tagged_test_name('test9',
+                                             {'master_testpath': 'subtestdir',
+                                              'subdir_tag': 'subdirtag'}))
+
+
+    def test_subtest_all_tag_components_together_subdir(self):
+        self.job.use_sequence_number = True
+        self.job.automatic_test_tag = 'auto'
+        expected = ('test10.tag._01_.auto',
+                    'subtestdir/test10.tag._01_.auto.subdir',
+                    'tag._01_.auto.subdir')
+        actual = self.job._build_tagged_test_name(
+            'test10', {'tag': 'tag', 'subdir_tag': 'subdir',
+                       'master_testpath': 'subtestdir'})
+        self.assertEqual(expected, actual)
+
+
 class test_make_outputdir(unittest.TestCase):
     def setUp(self):
         self.resultdir = tempfile.mkdtemp(suffix='unittest')