Changeset 41061 for branches/ipp-350_add_to_jira_conf_backups/confluence_backup_test.py

Timestamp:

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

Author:

fairlamb

Message:

test for subdirs with jira-conf rsyncs

File:

• branches/ipp-350_add_to_jira_conf_backups/confluence_backup_test.py (modified) (3 diffs)

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)