Changeset 41061

Timestamp:

Nov 5, 2019, 10:58:32 AM (7 years ago)

Author:

fairlamb

Message:

test for subdirs with jira-conf rsyncs

Location:

branches/ipp-350_add_to_jira_conf_backups

Files:

• confluence_backup.py (modified) (1 diff)
• confluence_backup_test.py (modified) (3 diffs)
• jira_backup.py (modified) (1 diff)
• jira_backup_test.py (modified) (3 diffs)
• testing/confluence_test.config (modified) (1 diff)
• testing/jira_test.config (modified) (1 diff)

branches/ipp-350_add_to_jira_conf_backups/confluence_backup.py

@@ -38 +38 @@
         , ConfigSchemaLine('additional_args', False, list,
             cfg_help.SpecialSchemaProcessing.space_separated)
+        , ConfigSchemaLine('sub-dirs', False, list,
+            cfg_help.SpecialSchemaProcessing.commma_separated)
         ])
     , ConfigSchemaSection('MYSQLDUMP',

branches/ipp-350_add_to_jira_conf_backups/confluence_backup_test.py

@@ -39 +39 @@
                        f"{os.path.join(tmpdir, 'rsync_source_dir2')}")
         , 'additional_args' : '-a --delete-after'
+        , 'sub-dirs' : 'conf_subdir1, conf_subdir2'
         }
     config['MYSQLDUMP'] = \
@@ -308 +309 @@
 class TestRsyncOfFiles(object):
 
-    def test_confluence_rsync(self, tmpdir):
+    def test_confluence_rsync_with_subdirs(self, tmpdir):
         """This should be similar to the regular Backup version"""
         create_items_for_full_confluence_backup_test(tmpdir)
@@ -316 +317 @@
 
         # Expected resulting rsync directories
-        expected_confluence_host_rsync1 = os.path.join(tmpdir, "host_backup_path", "rsync_source_dir1")
-        expected_confluence_bak1_rsync1 = os.path.join(tmpdir, "backup_1_path",    "rsync_source_dir1")
-        expected_confluence_bak2_rsync1 = os.path.join(tmpdir, "backup_2_path",    "rsync_source_dir1")
-        expected_confluence_host_rsync2 = os.path.join(tmpdir, "host_backup_path", "rsync_source_dir2")
-        expected_confluence_bak1_rsync2 = os.path.join(tmpdir, "backup_1_path",    "rsync_source_dir2")
-        expected_confluence_bak2_rsync2 = os.path.join(tmpdir, "backup_2_path",    "rsync_source_dir2")
+        expected_confluence_host_rsync1 = os.path.join(tmpdir, "host_backup_path", "conf_subdir1", "rsync_source_dir1")
+        expected_confluence_bak1_rsync1 = os.path.join(tmpdir, "backup_1_path",    "conf_subdir1", "rsync_source_dir1")
+        expected_confluence_bak2_rsync1 = os.path.join(tmpdir, "backup_2_path",    "conf_subdir1", "rsync_source_dir1")
+        expected_confluence_host_rsync2 = os.path.join(tmpdir, "host_backup_path", "conf_subdir2", "rsync_source_dir2")
+        expected_confluence_bak1_rsync2 = os.path.join(tmpdir, "backup_1_path",    "conf_subdir2", "rsync_source_dir2")
+        expected_confluence_bak2_rsync2 = os.path.join(tmpdir, "backup_2_path",    "conf_subdir2", "rsync_source_dir2")
         assert not os.path.exists(expected_confluence_host_rsync1)
         assert not os.path.exists(expected_confluence_bak1_rsync1)

branches/ipp-350_add_to_jira_conf_backups/jira_backup.py

@@ -38 +38 @@
         , ConfigSchemaLine('additional_args', False, list,
             cfg_help.SpecialSchemaProcessing.space_separated)
+        , ConfigSchemaLine('sub-dirs', False, list,
+            cfg_help.SpecialSchemaProcessing.commma_separated)
         ])
     , ConfigSchemaSection('MYSQLDUMP',

branches/ipp-350_add_to_jira_conf_backups/jira_backup_test.py

@@ -38 +38 @@
                        f"{os.path.join(tmpdir, 'rsync_source_dir2')}")
         , 'additional_args' : '-a --delete-after'
+        , 'sub-dirs' : 'jira_subdir1, jira_subdir2'
         }
     config['MYSQLDUMP'] = \
@@ -309 +310 @@
 class TestRsyncOfFiles(object):
 
-    def test_jira_rsync(self, tmpdir):
+    def test_jira_rsync_with_subdirs(self, tmpdir):
         """This should be similar to the regular Backup version"""
         create_items_for_full_jira_backup_test(tmpdir)
@@ -317 +318 @@
 
         # Expected resulting rsync directories
-        expected_jira_host_rsync1 = os.path.join(tmpdir, "host_backup_path", "rsync_source_dir1")
-        expected_jira_bak1_rsync1 = os.path.join(tmpdir, "backup_1_path",    "rsync_source_dir1")
-        expected_jira_bak2_rsync1 = os.path.join(tmpdir, "backup_2_path",    "rsync_source_dir1")
-        expected_jira_host_rsync2 = os.path.join(tmpdir, "host_backup_path", "rsync_source_dir2")
-        expected_jira_bak1_rsync2 = os.path.join(tmpdir, "backup_1_path",    "rsync_source_dir2")
-        expected_jira_bak2_rsync2 = os.path.join(tmpdir, "backup_2_path",    "rsync_source_dir2")
+        expected_jira_host_rsync1 = os.path.join(tmpdir, "host_backup_path", "jira_subdir1", "rsync_source_dir1")
+        expected_jira_bak1_rsync1 = os.path.join(tmpdir, "backup_1_path",    "jira_subdir1", "rsync_source_dir1")
+        expected_jira_bak2_rsync1 = os.path.join(tmpdir, "backup_2_path",    "jira_subdir1", "rsync_source_dir1")
+        expected_jira_host_rsync2 = os.path.join(tmpdir, "host_backup_path", "jira_subdir2", "rsync_source_dir2")
+        expected_jira_bak1_rsync2 = os.path.join(tmpdir, "backup_1_path",    "jira_subdir2", "rsync_source_dir2")
+        expected_jira_bak2_rsync2 = os.path.join(tmpdir, "backup_2_path",    "jira_subdir2", "rsync_source_dir2")
         assert not os.path.exists(expected_jira_host_rsync1)
         assert not os.path.exists(expected_jira_bak1_rsync1)

branches/ipp-350_add_to_jira_conf_backups/testing/confluence_test.config

@@ -20 +20 @@
 sources = /opt/atlassian, /var/atlassian
 additional_args = -a --delete-after
+sub-dirs = conf-install, conf-home
 
 [MYSQLDUMP]

branches/ipp-350_add_to_jira_conf_backups/testing/jira_test.config

@@ -19 +19 @@
 sources = /opt/atlassian, /var/atlassian
 additional_args = -a --delete-after
+sub-dirs = jira-install, jira-home
 
 [MYSQLDUMP]