Changeset 40967 for trunk/tools/backups/utils/generic_utils_test.py

Timestamp:

Oct 24, 2019, 2:41:04 PM (7 years ago)

Author:

fairlamb

Message:

Merge IPP-259 into trunk: Improved backup programs

Location:

trunk

Files:

• . (modified) (1 prop)
• tools (modified) (1 prop)
• tools/backups/utils/generic_utils_test.py (modified) (10 diffs)

trunk/tools/backups/utils/generic_utils_test.py

@@ -1 @@
-import backups.utils.generic_utils as utils
 import os
 import pytest
 
-from backups.utils.errors import ValidationError
+from .generic_utils import *
+from .errors import ValidationError
 from pathlib import Path
 
@@ -19 +19 @@
     def test_copy_fails_with_none_args(self, tmpdir):
         with pytest.raises(ValidationError):
-            utils.copy_to_dir(None, tmpdir)
+            copy_to_dir(None, tmpdir)
 
         with pytest.raises(ValidationError):
             real_file = make_a_real_file(tmpdir, "file.txt")
-            utils.copy_to_dir(real_file, None)
+            copy_to_dir(real_file, None)
 
     def test_copy_fails_if_source_does_not_exist(self, tmpdir):
         with pytest.raises(ValidationError):
-            utils.copy_to_dir("not a real file", tmpdir)
+            copy_to_dir("not a real file", tmpdir)
 
     def test_copy_fails_if_destination_is_not_real(self, tmpdir):
         with pytest.raises(ValidationError):
             real_file = make_a_real_file(tmpdir, "real_file.txt")
-            utils.copy_to_dir(real_file, "not a real directory")
+            copy_to_dir(real_file, "not a real directory")
 
     def test_copy_fails_if_destination_is_not_a_directory(self, tmpdir):
@@ -42 +42 @@
 
         with pytest.raises(ValidationError):
-            utils.copy_to_dir(real_file, not_a_directory)
+            copy_to_dir(real_file, not_a_directory)
 
     def test_copy_to_dir(self, tmpdir):
@@ -60 +60 @@
 
         # run copy function and confirm copy exists (and original)
-        result = utils.copy_to_dir(file_to_copy, destination_dir)
+        result = copy_to_dir(file_to_copy, destination_dir)
         assert result == 0
         assert os.path.exists(file_to_copy)
@@ -98 +98 @@
 
         # Provide only the original tmpdir to the copying function
-        utils.copy_to_dir(subdir, destination_dir, True)
+        copy_to_dir(subdir, destination_dir, True)
 
         # assert that the subdirs and files all exist
@@ -110 +110 @@
 
         with pytest.raises(ValidationError):
-            utils.copy_multiple_items_to_multiple_dirs(None, None)
-
-        with pytest.raises(ValidationError):
-            utils.copy_multiple_items_to_multiple_dirs(tmpdir, None)
-
-        with pytest.raises(ValidationError):
-            utils.copy_multiple_items_to_multiple_dirs(None, tmpdir)
+            copy_multiple_items_to_multiple_dirs(None, None)
+
+        with pytest.raises(ValidationError):
+            copy_multiple_items_to_multiple_dirs(tmpdir, None)
+
+        with pytest.raises(ValidationError):
+            copy_multiple_items_to_multiple_dirs(None, tmpdir)
 
     def test_copy_requires_args_to_be_in_list_format(self, tmpdir):
@@ -122 +122 @@
         not_a_list = "not a list"
         with pytest.raises(ValidationError):
-            utils.copy_multiple_items_to_multiple_dirs(not_a_list, tmpdir)
+            copy_multiple_items_to_multiple_dirs(not_a_list, tmpdir)
 
         tmpfile = make_a_real_file(tmpdir, "a_file.txt")
         with pytest.raises(ValidationError):
-            utils.copy_multiple_items_to_multiple_dirs(tmpfile, not_a_list)
+            copy_multiple_items_to_multiple_dirs(tmpfile, not_a_list)
 
     def test_copy_is_fine_with_single_items(self, tmpdir):
@@ -136 +136 @@
         assert not os.path.exists(expected_file)
 
-        result = utils.copy_multiple_items_to_multiple_dirs([tmpfile], [destination])
+        result = copy_multiple_items_to_multiple_dirs([tmpfile], [destination])
         assert result == 0
         assert os.path.exists(expected_file)
@@ -168 +168 @@
         assert len(expected_files) == 9
 
-        result = utils.copy_multiple_items_to_multiple_dirs(source_files, dest_paths)
+        result = copy_multiple_items_to_multiple_dirs(source_files, dest_paths)
         assert result == 0
         for ef in expected_files:
@@ -212 +212 @@
 
         # Provide only the original tmpdir to the copying function
-        utils.copy_multiple_items_to_multiple_dirs([tmpdir], [destination_dir], True)
+        copy_multiple_items_to_multiple_dirs([tmpdir], [destination_dir], True)
 
         # assert that the subdirs and files all exist