From c1a938b14455bf686b32a7785ce39fec4e520c4d Mon Sep 17 00:00:00 2001
From: lukas leufen <l.leufen@fz-juelich.de>
Date: Fri, 24 Apr 2020 14:36:00 +0200
Subject: [PATCH] test update
---
test/test_configuration/test_path_config.py | 11 ++++++-----
test/test_modules/test_experiment_setup.py | 4 ++--
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/test/test_configuration/test_path_config.py b/test/test_configuration/test_path_config.py
index cc5580f2..cb40d583 100644
--- a/test/test_configuration/test_path_config.py
+++ b/test/test_configuration/test_path_config.py
@@ -75,12 +75,12 @@ class TestSetExperimentName:
exp_name, exp_path = set_experiment_name()
assert exp_name == "TestExperiment"
assert exp_path == os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "TestExperiment"))
- exp_name, exp_path = set_experiment_name(experiment_date="2019-11-14", experiment_path="./test2")
+ exp_name, exp_path = set_experiment_name(experiment_name="2019-11-14", experiment_path="./test2")
assert exp_name == "2019-11-14_network"
assert exp_path == os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "test2", exp_name))
def test_set_experiment_from_sys(self):
- exp_name, _ = set_experiment_name(experiment_date="2019-11-14")
+ exp_name, _ = set_experiment_name(experiment_name="2019-11-14")
assert exp_name == "2019-11-14_network"
def test_set_experiment_hourly(self):
@@ -91,14 +91,15 @@ class TestSetExperimentName:
class TestSetBootstrapPath:
- def test_bootstrap_path_is_none(self):
+ @mock.patch("os.makedirs", side_effect=None)
+ def test_bootstrap_path_is_none(self, mock_makedir):
bootstrap_path = set_bootstrap_path(None, 'TestDataPath/', 'daily')
- assert bootstrap_path == 'TestDataPath/../bootstrap_daily'
+ assert bootstrap_path == os.path.abspath('TestDataPath/../bootstrap_daily')
@mock.patch("os.makedirs", side_effect=None)
def test_bootstap_path_is_given(self, mock_makedir):
bootstrap_path = set_bootstrap_path('Test/path/to/boots', None, None)
- assert bootstrap_path == 'Test/path/to/boots'
+ assert bootstrap_path == os.path.abspath('./Test/path/to/boots')
class TestCheckPath:
diff --git a/test/test_modules/test_experiment_setup.py b/test/test_modules/test_experiment_setup.py
index dd1bda1b..585335b9 100644
--- a/test/test_modules/test_experiment_setup.py
+++ b/test/test_modules/test_experiment_setup.py
@@ -52,7 +52,7 @@ class TestExperimentSetup:
assert data_store.get("create_new_model", "general") is True
assert data_store.get("fraction_of_training", "general") == 0.8
# set experiment name
- assert data_store.get("experiment_name", "general") == "TestExperiment"
+ assert data_store.get("experiment_name", "general") == "TestExperiment_daily"
path = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "TestExperiment"))
assert data_store.get("experiment_path", "general") == path
default_statistics_per_var = {'o3': 'dma8eu', 'relhum': 'average_values', 'temp': 'maximum',
@@ -121,7 +121,7 @@ class TestExperimentSetup:
assert data_store.get("create_new_model", "general") is True
assert data_store.get("fraction_of_training", "general") == 0.5
# set experiment name
- assert data_store.get("experiment_name", "general") == "TODAY_network"
+ assert data_store.get("experiment_name", "general") == "TODAY_network_daily"
path = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "data", "testExperimentFolder",
"TODAY_network"))
assert data_store.get("experiment_path", "general") == path
--
GitLab