Changeset 40897 for branches/ipp-132_automate_jira_conf_backups/backups

Timestamp:

Oct 3, 2019, 11:51:21 AM (7 years ago)

Author:

fairlamb

Message:

Better errors, chmod wrapper, fixed config loading and tests

Location:

branches/ipp-132_automate_jira_conf_backups/backups

Files:

• backup_atlassian_applications.py (modified) (3 diffs)
• backup_atlassian_applications_test.py (modified) (2 diffs)
• full_atlassian_backup_test.py (modified) (2 diffs)
• utils (deleted)

branches/ipp-132_automate_jira_conf_backups/backups/backup_atlassian_applications.py

@@ -13 +13 @@
 # a restructure would be needed
 # Ideally, the utils should be added to the path.
-import utils.subprocess_utils as sub_utils
-
-
-DEFAULT_CONFIG_FILE = path.abspath('./atlassian_backups.config')
+import subprocess_utils as sub_utils
+
+
+DEFAULT_CONFIG_FILE = path.join(path.dirname(__file__), 'atlassian_backups.config')
 
 
@@ -236 +236 @@
         jira_tar_name = datetime.date.today().strftime("%Y_%m_%d") + "_jira_attachments.tar"
         jira_tar_filepath = path.join(latest_paths[0], jira_tar_name)
-        jira_tar_args = ["-cf", jira_tar_filepath, self.jira_attachments_path]
+        jira_tar_args = ["-C", "/", "-cf", jira_tar_filepath, self.jira_attachments_path.strip('/')]
         sub_utils.tar_wrapper(jira_tar_args)
         sub_utils.chmod_wrapper(['774', jira_tar_filepath])
@@ -246 +246 @@
         confluence_tar_name = datetime.date.today().strftime("%Y_%m_%d") + "_confluence_attachments.tar"
         confluence_tar_filepath = path.join(latest_paths[0], confluence_tar_name)
-        confluence_tar_args = ["-cf", confluence_tar_filepath, self.conf_attachments_path]
+        confluence_tar_args = ["-C", "/", "-cf", confluence_tar_filepath, self.conf_attachments_path.strip('/')]
         sub_utils.tar_wrapper(confluence_tar_args)
         sub_utils.chmod_wrapper(['774', confluence_tar_filepath])

branches/ipp-132_automate_jira_conf_backups/backups/backup_atlassian_applications_test.py

@@ -8 +8 @@
 
 import full_atlassian_backup_test as fab_test
-import utils.subprocess_utils as sub_utils
+import subprocess_utils as sub_utils
 
 from backup_atlassian_applications import AtlassianBackups
 
-TEST_DEFAULT_CONFIG_FILE = "./testing/test.config"
+TEST_DEFAULT_CONFIG_FILE = os.path.join(os.path.dirname(__file__), './testing/test.config')
 
 
@@ -47 +47 @@
 
     def test_default_config_loads_with_no_args(self):
-        assert os.path.exists("./atlassian_backups.config")
+        default_config = baa.DEFAULT_CONFIG_FILE
+        assert os.path.exists(default_config)
         ab = AtlassianBackups()
         assert ab.host_backup_path      == "/export/ippops4.0/atlassian_backups"

branches/ipp-132_automate_jira_conf_backups/backups/full_atlassian_backup_test.py

@@ -6 +6 @@
 
 from backup_atlassian_applications import AtlassianBackups
-
-TEST_DEFAULT_CONFIG_FILE = "./testing/test.config"
-
 
 def create_all_paths_and_folders(ab_class: AtlassianBackups, tmpdir) -> AtlassianBackups:
@@ -140 +137 @@
 
     def test_entire_process(self, tmpdir):
-        ab = AtlassianBackups(config_file=TEST_DEFAULT_CONFIG_FILE)
+        test_config_file = os.path.join(os.path.dirname(__file__), 'testing', 'test.config')
+
+        ab = AtlassianBackups(config_file=test_config_file)
         ab = create_all_paths_and_folders(ab, tmpdir)