Changeset 40898

Timestamp:

Oct 3, 2019, 12:46:09 PM (7 years ago)

Author:

fairlamb

Message:

separated out erros into it's own class and moved files to be under one module...not sure if history saved

Location:

branches/ipp-132_automate_jira_conf_backups/backups

Files:

• backup_atlassian_applications.py (modified) (2 diffs)
• backup_atlassian_applications_test.py (modified) (2 diffs)
• utils (added)
• utils/__init__.py (added)
• utils/database (added)
• utils/database/__init__.py (added)
• utils/database/database_tool.py (added)
• utils/database/database_tool_test.py (added)
• utils/errors.py (added)
• utils/generic_utils.py (added)
• utils/generic_utils_test.py (added)
• utils/python (moved) (moved from branches/ipp-132_automate_jira_conf_backups/utils/python )
• utils/subprocess_utils.py (added)
• utils/subprocess_utils_test.py (added)

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

@@ -9 +9 @@
 import sys
 
-# note that this replies on sym link to the 'trunk/tools/utils/python' folder existing
-# in this directory with the name 'utils'. This is not an elegant solution, but
-# a restructure would be needed
-# Ideally, the utils should be added to the path.
-import subprocess_utils as sub_utils
-
+import backups.utils.subprocess_utils as sub_utils
+from backups.utils.errors import ConfigError, SubprocessError
 
 DEFAULT_CONFIG_FILE = path.join(path.dirname(__file__), 'atlassian_backups.config')
-
-
-class ConfigError(Exception):
-    """Error in loading the config file"""
-
-    def __init__(self, config_item, message):
-        self.config_item = config_item
-        self.message = message
 
 
@@ -284 +272 @@
             decoded_stderr = stde.decode()
             if decoded_stderr.casefold().find('error'.casefold()) > -1:
-                raise sub_utils.SubprocessError()
+                raise SubprocessError()
 
         # move the dump file to the correct locations

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

@@ -1 @@
-import backup_atlassian_applications as baa
+import backups.backup_atlassian_applications as baa
 import configparser
 import datetime
@@ -7 +7 @@
 from pathlib import Path
 
-import full_atlassian_backup_test as fab_test
-import subprocess_utils as sub_utils
-
-from backup_atlassian_applications import AtlassianBackups
+import backups.full_atlassian_backup_test as fab_test
+import backups.utils.subprocess_utils as sub_utils
+
+from backups.backup_atlassian_applications import AtlassianBackups
 
 TEST_DEFAULT_CONFIG_FILE = os.path.join(os.path.dirname(__file__), './testing/test.config')