Merge pull request #140 from OpenDataAlex/process_tracker_python-100

Process tracker python 100

Author: OpenDataAlex

.travis.yml

@@ -14,6 +14,7 @@ after_success:
 before_script:
 - mkdir $HOME/.process_tracker
 - if [[ ! -z "$DB" ]]; then mv configs/${DB}_config.ini $HOME/.process_tracker/process_tracker_config.ini; fi
+- cp configs/process_tracker_config_dev.ini $HOME/.process_tracker/process_tracker_config_dev.ini
 - if [[ "$DB" == "postgres" ]]; then psql -f dbscripts/postgresql_account_create.sql -U postgres; fi
 - if [[ "$DB" == "postgres" ]]; then psql -f dbscripts/postgresql_process_tracker.sql process_tracker -U postgres; fi
 - if [[ "$DB" == "postgres" ]]; then psql -f dbscripts/postgresql_process_tracker_defaults.sql process_tracker -U postgres; fi

configs/process_tracker_config_dev.ini

@@ -0,0 +1,9 @@
+[DEFAULT]
+log_level = ERROR
+max_concurrent_failures = 5
+data_store_type = postgresql
+data_store_username = pt_admin
+data_store_password = Testing1!
+data_store_host = localhost
+data_store_port = 5432
+data_store_name = process_tracker

process_tracker/utilities/settings.py

@@ -40,7 +40,10 @@ def __init__(self, config_location=None):
         else:
             self.config_path = config_location
 
-            if "process_tracker_config.ini" not in self.config_path:
+            if (
+                "process_tracker_config.ini" not in self.config_path
+                and ".ini" not in self.config_path
+            ):
                 self.logger.debug(
                     "process_tracker_config.ini not present.  Appending to %s"
                     % self.config_path

tests/utilities/test_settings_manager.py

@@ -56,6 +56,21 @@ def test_config_location_set_with_file(self):
 
         self.assertEqual(expected_result, given_result)
 
+    def test_config_location_set_with_ini_file(self):
+        """
+        Testing that if an .ini file that is NOT named process_tracker_config.ini_in the config_location, it is accepted
+        as the config file.
+        :return:
+        """
+
+        expected_result = "/home/travis/.process_tracker/process_tracker_config_dev.ini"
+
+        given_result = SettingsManager(
+            config_location="/home/travis/.process_tracker/process_tracker_config_dev.ini"
+        ).config_file
+
+        self.assertEqual(expected_result, given_result)
+
     def test_config_location_s3(self):
         """
         Testing that if config_location is set and the path is an s3 file/location, use that instead of the home