Merge branch 'master' into atul_benchmarking

georgia-tech-db · Sep 23, 2022 · d13670f · d13670f
2 parents 0c0a2d7 + 366ecdb
commit d13670f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 19 deletions.
diff --git a/.github/workflows/jenkins-job.yml b/.github/workflows/jenkins-job.yml
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -32,7 +32,6 @@ python setup.py install '''
     stage('Test') {
       steps {
         sh '''. env37/bin/activate
-sh script/test/test.sh
 coveralls'''
       }
     }

diff --git a/eva/configuration/bootstrap_environment.py b/eva/configuration/bootstrap_environment.py
@@ -89,7 +89,9 @@ def bootstrap_environment(eva_config_dir: Path, eva_installation_dir: Path):
         config_obj["core"]["catalog_database_uri"] = DB_DEFAULT_URI
         config_obj["storage"]["upload_dir"] = str(upload_dir.resolve())
 
+        yml_file.seek(0)
         yml_file.write(yaml.dump(config_obj))
+        yml_file.truncate()
 
     # set logger to appropriate level (debug or release)
     level = logging.WARN if mode == "release" else logging.DEBUG

diff --git a/eva/configuration/configuration_manager.py b/eva/configuration/configuration_manager.py
@@ -60,7 +60,9 @@ def _update(cls, category: str, key: str, value: str):
                 raise ValueError(f"Invalid yml file at {cls._yml_path}")
 
             config_obj[category][key] = value
+            yml_file.seek(0)
             yml_file.write(yaml.dump(config_obj))
+            yml_file.truncate()
 
     @classmethod
     def get_value(cls, category: str, key: str) -> Any:

diff --git a/test/configuration/test_configuration_manager.py b/test/configuration/test_configuration_manager.py
@@ -37,7 +37,7 @@ def test_configuration_manager_read_invalid_key(self):
             _ = self.config.get_value("core", "invalid")
 
     def test_configuration_manager_update_valid_key(self):
-        value = self.config.get_value("core", "datasets_dir")
+        value = self.config.get_value("core", "mode")
 
         updated = "debug2"
         self.config.update_value("core", "mode", updated)