Changeset 40944 for branches/ipp-259_genericise_backups/tools/backups/confluence_backup_test.py

Timestamp:

Oct 14, 2019, 4:59:32 PM (7 years ago)

Author:

fairlamb

Message:

Tidy up tests, and removed now unused files

File:

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

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

@@ -12 +12 @@
 
 
-JIRA_TEST_CONFIG = os.path.join(os.path.dirname(__file__), './testing/confluence_test.config')
+CONF_TEST_CONFIG = os.path.join(os.path.dirname(__file__), './testing/confluence_test.config')
 
 
@@ -113 +113 @@
 
     def test_load_from_config_file(self):
-        jb = ConfluenceBackup(config_file=JIRA_TEST_CONFIG)
+        jb = ConfluenceBackup(config_file=CONF_TEST_CONFIG)
         self.assert_defaults(jb)
 
-    def test_default_config_loads_with_no_args(self):
-        default_config = jbck_mod.DEFAULT_CONFIG_FILE
-        assert os.path.exists(default_config)
-        jb = ConfluenceBackup()
-        self.assert_defaults(jb)
+    def test_default_config_fails_to_load_if_the_file_does_not_exist(self):
+        default_config = jbck_mod.EXPECTED_CONFIG_FILE
+        assert not os.path.exists(default_config)
+
+        with pytest.raises(errs.ValidationError) as e:
+            ConfluenceBackup()
+        assert "ValidationError: Config filepath does not exist" in str(e)
 
     def test_default_arguments(self):
-        jb = ConfluenceBackup(config_file=JIRA_TEST_CONFIG)
+        jb = ConfluenceBackup(config_file=CONF_TEST_CONFIG)
         self.assert_defaults(jb)
 
@@ -166 +168 @@
 
     def test_nonexistant_config_file_raises_error(self):
-        with pytest.raises(errs.ConfigError):
+        with pytest.raises(errs.ValidationError) as e:
             ConfluenceBackup("not a real file path")
+        assert "ValidationError: Config filepath does not exist" in str(e)
 
     def test_main_loads_default_and_fails_due_to_missing_paths(self):
         with pytest.raises(errs.ValidationError) as e:
             jbck_mod.main()
-        assert "ValidationError: target path does not exist:" in str(e)
+        assert "ValidationError: Config filepath does not exist" in str(e)
 
 
@@ -180 +183 @@
 
     def test_get_confluence_backup_date_format(self):
-        jb = ConfluenceBackup(config_file=JIRA_TEST_CONFIG)
+        jb = ConfluenceBackup(config_file=CONF_TEST_CONFIG)
         today = datetime.date.today()
         expected_format = today.strftime("%Y_%m_%d")
@@ -190 +193 @@
 
     def test_copying_fails_if_paths_not_present(self):
-        jb = ConfluenceBackup(config_file=JIRA_TEST_CONFIG)
+        jb = ConfluenceBackup(config_file=CONF_TEST_CONFIG)
         # return_value = jb._copy_confluence_backup()
         with pytest.raises(ValidationError) as e: