Changeset 40912 for branches/ipp-259_genericise_backups/tools/backups/backup_atlassian_applications_test.py

Timestamp:

Oct 4, 2019, 4:50:00 PM (7 years ago)

Author:

fairlamb

Message:

that function was used - moved it to generic; separated out jira/conf tar

File:

• branches/ipp-259_genericise_backups/tools/backups/backup_atlassian_applications_test.py (modified) (5 diffs)

branches/ipp-259_genericise_backups/tools/backups/backup_atlassian_applications_test.py

@@ -9 +9 @@
 import backups.full_atlassian_backup_test as fab_test
 import backups.utils.subprocess_utils as sub_utils
+import backups.utils.generic_utils as gen_utils
 
 from backups.backup_atlassian_applications import AtlassianBackups
+from backups.utils.errors import ValidationError
 
 TEST_DEFAULT_CONFIG_FILE = os.path.join(os.path.dirname(__file__), './testing/test.config')
@@ -215 +217 @@
         destination_paths = [ "/Two", "/paths"]
 
-        return_is_non_zero = baa._move_dir_contents_to_dir(source_paths, destination_paths)
-        assert return_is_non_zero != 0
+        with pytest.raises(ValidationError):
+            gen_utils.move_dirs(source_paths, destination_paths)
 
     def test_moving_old_backups(self, tmpdir):
@@ -275 +277 @@
 
         # run the move
-        return_result = baa._move_dir_contents_to_dir(source_paths, destination_paths)
+        return_result = gen_utils.move_dirs(source_paths, destination_paths)
         assert return_result == 0
 
@@ -357 +359 @@
 class TestTaringOfAttachments(object):
 
-    def test_attachments_tar(self, tmpdir):
+    def test_jira_attachments_tar(self, tmpdir):
 
         ab = AtlassianBackups(config_file=TEST_DEFAULT_CONFIG_FILE)
@@ -364 +366 @@
         today = datetime.date.today().strftime("%Y_%m_%d")
         jira_tar_name = today + "_jira_attachments.tar"
+        expected_jira_host_tar = os.path.join(ab.host_backup_path, "latest", jira_tar_name)
+        expected_jira_bak1_tar = os.path.join(ab.backup_1_path, "latest", jira_tar_name)
+        expected_jira_bak2_tar = os.path.join(ab.backup_2_path, "latest", jira_tar_name)
+        assert not os.path.exists(expected_jira_host_tar)
+        assert not os.path.exists(expected_jira_bak1_tar)
+        assert not os.path.exists(expected_jira_bak2_tar)
+
+        tar_result = ab._tar_jira_attachments()
+        assert tar_result == 0
+
+        assert os.path.exists(expected_jira_host_tar)
+        assert os.path.exists(expected_jira_bak1_tar)
+        assert os.path.exists(expected_jira_bak2_tar)
+
+    def test_conf_attachments_tar(self, tmpdir):
+
+        ab = AtlassianBackups(config_file=TEST_DEFAULT_CONFIG_FILE)
+        ab = fab_test.create_all_paths_and_folders(ab, tmpdir)
+
+        today = datetime.date.today().strftime("%Y_%m_%d")
         conf_tar_name = today + "_confluence_attachments.tar"
-        expected_jira_host_tar = os.path.join(ab.host_backup_path, "latest", jira_tar_name)
         expected_conf_host_tar = os.path.join(ab.host_backup_path, "latest", conf_tar_name)
-        expected_jira_bak1_tar = os.path.join(ab.backup_1_path, "latest", jira_tar_name)
         expected_conf_bak1_tar = os.path.join(ab.backup_1_path, "latest", conf_tar_name)
-        expected_jira_bak2_tar = os.path.join(ab.backup_2_path, "latest", jira_tar_name)
         expected_conf_bak2_tar = os.path.join(ab.backup_2_path, "latest", conf_tar_name)
-        assert not os.path.exists(expected_jira_host_tar)
         assert not os.path.exists(expected_conf_host_tar)
-        assert not os.path.exists(expected_jira_bak1_tar)
         assert not os.path.exists(expected_conf_bak1_tar)
-        assert not os.path.exists(expected_jira_bak2_tar)
         assert not os.path.exists(expected_conf_bak2_tar)
 
-        tar_result = ab._tar_attachments()
+        tar_result = ab._tar_conf_attachments()
         assert tar_result == 0
 
-        assert os.path.exists(expected_jira_host_tar)
         assert os.path.exists(expected_conf_host_tar)
-        assert os.path.exists(expected_jira_bak1_tar)
         assert os.path.exists(expected_conf_bak1_tar)
-        assert os.path.exists(expected_jira_bak2_tar)
         assert os.path.exists(expected_conf_bak2_tar)