From 6605b70315ea3300be88f08d765db1c4b383fa79 Mon Sep 17 00:00:00 2001
From: lukas leufen <l.leufen@fz-juelich.de>
Date: Fri, 19 Jun 2020 16:18:08 +0200
Subject: [PATCH] adjust two tests
---
conftest.py | 2 +-
test/test_modules/test_model_setup.py | 2 +-
test/test_modules/test_training.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/conftest.py b/conftest.py
index d8f0897f..207606e6 100644
--- a/conftest.py
+++ b/conftest.py
@@ -27,7 +27,7 @@ def execute_removing(path):
if "data" in list_dir and path != os.path.dirname(__file__): # do not delete data folder in src
shutil.rmtree(os.path.join(path, "data"), ignore_errors=True)
# remove TestExperiment folders
- remove_files_from_regex(list_dir, path, re.compile(r"TestExperiment_.*"))
+ remove_files_from_regex(list_dir, path, re.compile(r"TestExperiment.*"))
# remove all tracking json
remove_files_from_regex(list_dir, path, re.compile(r"tracking_\d*\.json"))
# remove all tracking pdf
diff --git a/test/test_modules/test_model_setup.py b/test/test_modules/test_model_setup.py
index b8652c33..b715445e 100644
--- a/test/test_modules/test_model_setup.py
+++ b/test/test_modules/test_model_setup.py
@@ -88,7 +88,7 @@ class TestModelSetup:
setup_with_gen.build_model()
assert isinstance(setup_with_gen.model, AbstractModelClass)
expected = {"window_history_size", "window_lead_time", "channels", "dropout_rate", "regularizer", "initial_lr",
- "optimizer", "epochs", "batch_size", "activation"}
+ "optimizer", "epochs", "activation"}
assert expected <= self.current_scope_as_set(setup_with_gen)
def test_set_channels(self, setup_with_gen_tiny):
diff --git a/test/test_modules/test_training.py b/test/test_modules/test_training.py
index a26bd18c..66ba0709 100644
--- a/test/test_modules/test_training.py
+++ b/test/test_modules/test_training.py
@@ -155,7 +155,7 @@ class TestTraining:
obj.data_store.set("model", model, "general.model")
obj.data_store.set("model_path", model_path, "general")
obj.data_store.set("model_name", os.path.join(model_path, "test_model.h5"), "general.model")
- obj.data_store.set("batch_size", 256, "general.model")
+ obj.data_store.set("batch_size", 256, "general")
obj.data_store.set("epochs", 2, "general.model")
clbk, hist, lr = callbacks
obj.data_store.set("callbacks", clbk, "general.model")
--
GitLab