[unittests] Update file paths in unittests for new directory layout

Updates the filepaths in our unittests for the temp data files to
reflect their new location in the updated directory layout.

Related: #2431

Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>

3 files changed, 15 insertions, 15 deletions

diff --git a/tests/unittests/archive_tests.py b/tests/unittests/archive_tests.py
index 320006d0..db97feba 100644
--- a/tests/unittests/archive_tests.py
+++ b/tests/unittests/archive_tests.py
@@ -37,10 +37,10 @@ class TarFileArchiveTest(unittest.TestCase):
                                                     'test.tar')))
 
     def test_add_file(self):
-        self.tf.add_file('tests/ziptest')
+        self.tf.add_file('tests/unittests/ziptest')
         self.tf.finalize('auto')
 
-        self.check_for_file('test/tests/ziptest')
+        self.check_for_file('test/tests/unittests/ziptest')
 
     def test_add_node_dev_null(self):
         st = os.lstat('/dev/null')
@@ -69,10 +69,10 @@ class TarFileArchiveTest(unittest.TestCase):
 #        self.check_for_file('test/tests/ziptest')
 
     def test_add_renamed(self):
-        self.tf.add_file('tests/ziptest', dest='tests/ziptest_renamed')
+        self.tf.add_file('tests/unittests/ziptest', dest='tests/unittests/ziptest_renamed')
         self.tf.finalize('auto')
 
-        self.check_for_file('test/tests/ziptest_renamed')
+        self.check_for_file('test/tests/unittests/ziptest_renamed')
 
 # Since commit 179d9bb add_file does not support recursive directory
 # addition. Disable this test for now.
diff --git a/tests/unittests/plugin_tests.py b/tests/unittests/plugin_tests.py
index 2f362c94..dda8c13a 100644
--- a/tests/unittests/plugin_tests.py
+++ b/tests/unittests/plugin_tests.py
@@ -302,8 +302,8 @@ class PluginTests(unittest.TestCase):
     def test_copy_dir(self):
         self.mp._do_copy_path("tests")
         self.assertEquals(
-            self.mp.archive.m["tests/plugin_tests.py"],
-            'tests/plugin_tests.py')
+            self.mp.archive.m["tests/unittests/plugin_tests.py"],
+            'tests/unittests/plugin_tests.py')
 
     def test_copy_dir_bad_path(self):
         self.mp._do_copy_path("not_here_tests")
@@ -334,7 +334,7 @@ class PluginTests(unittest.TestCase):
 
 class AddCopySpecTests(unittest.TestCase):
 
-    expect_paths = set(['tests/tail_test.txt'])
+    expect_paths = set(['tests/unittests/tail_test.txt'])
 
     def setUp(self):
         self.mp = MockPlugin({
@@ -354,11 +354,11 @@ class AddCopySpecTests(unittest.TestCase):
         self.assertEquals(self.mp.copy_paths, expected_paths)
 
     def test_single_file_no_limit(self):
-        self.mp.add_copy_spec("tests/tail_test.txt")
+        self.mp.add_copy_spec("tests/unittests/tail_test.txt")
         self.assert_expect_paths()
 
     def test_single_file_under_limit(self):
-        self.mp.add_copy_spec("tests/tail_test.txt", 1)
+        self.mp.add_copy_spec("tests/unittests/tail_test.txt", 1)
         self.assert_expect_paths()
 
     def test_single_file_over_limit(self):
@@ -378,7 +378,7 @@ class AddCopySpecTests(unittest.TestCase):
         self.assertFalse(self.mp.add_copy_spec(None, 1))
 
     def test_glob_file(self):
-        self.mp.add_copy_spec('tests/tail_test.*')
+        self.mp.add_copy_spec('tests/unittests/tail_test.*')
         self.assert_expect_paths()
 
     def test_glob_file_limit_no_limit(self):
@@ -403,11 +403,11 @@ class AddCopySpecTests(unittest.TestCase):
         shutil.rmtree(tmpdir)
 
     def test_multiple_files_no_limit(self):
-        self.mp.add_copy_spec(['tests/tail_test.txt', 'tests/test.txt'])
+        self.mp.add_copy_spec(['tests/unittests/tail_test.txt', 'tests/unittests/test.txt'])
         self.assertEquals(len(self.mp.copy_paths), 2)
 
     def test_multiple_files_under_limit(self):
-        self.mp.add_copy_spec(['tests/tail_test.txt', 'tests/test.txt'], 1)
+        self.mp.add_copy_spec(['tests/unittests/tail_test.txt', 'tests/unittests/test.txt'], 1)
         self.assertEquals(len(self.mp.copy_paths), 2)
 
 
diff --git a/tests/unittests/utilities_tests.py b/tests/unittests/utilities_tests.py
index 64be9f1e..83a4dc28 100644
--- a/tests/unittests/utilities_tests.py
+++ b/tests/unittests/utilities_tests.py
@@ -43,12 +43,12 @@ class GrepTest(unittest.TestCase):
 class TailTest(unittest.TestCase):
 
     def test_tail(self):
-        t = tail("tests/tail_test.txt", 10)
+        t = tail("tests/unittests/tail_test.txt", 10)
         self.assertEquals(t, b"last line\n")
 
     def test_tail_too_many(self):
-        t = tail("tests/tail_test.txt", 200)
-        expected = open("tests/tail_test.txt", "r").read()
+        t = tail("tests/unittests/tail_test.txt", 200)
+        expected = open("tests/unittests/tail_test.txt", "r").read()
         self.assertEquals(t, str.encode(expected))