Changeset 40944 for branches/ipp-259_genericise_backups/tools/backups/backup.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/backup.py (modified) (1 diff)

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

@@ -29 +29 @@
 
         config = ConfigParser()
+        expected_class = configparser.ConfigParser
         if config_class_or_filepath is None:
-            raise errs.ConfigError(config_class_or_filepath, "Neither config settings or filepath of config given")
-        elif isinstance(config_class_or_filepath, configparser.ConfigParser):
+            raise errs.ValidationError("ValidationError: config settings or filepath to config must be given")
+        elif isinstance(config_class_or_filepath, expected_class):
             config = config_class_or_filepath
-        elif path.exists(config_class_or_filepath):
-            config.read(config_class_or_filepath)
+        elif not path.exists(config_class_or_filepath):
+            raise errs.ValidationError(f"ValidationError: Config filepath does not exist (or incorrect class given, expected: {expected_class})")
+        config.read(config_class_or_filepath)
 
         self.read_default_section(config)