From a06f6d0993e25c12397a11ce3f0c0a01baabefc9 Mon Sep 17 00:00:00 2001
From: lukas leufen <l.leufen@fz-juelich.de>
Date: Thu, 14 Nov 2019 12:50:50 +0100
Subject: [PATCH] adjusted tests
---
src/helpers.py | 2 +-
test/test_helpers.py | 12 ++++++++++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/helpers.py b/src/helpers.py
index b087e730..e380caa6 100644
--- a/src/helpers.py
+++ b/src/helpers.py
@@ -130,7 +130,7 @@ class TimeTracking(object):
def prepare_host():
hostname = socket.gethostname()
user = os.getlogin()
- if hostname == 'ZAM144': # pragma: no branch
+ if hostname == 'ZAM144':
path = f'/home/{user}/Data/toar_daily/'
elif hostname == 'zam347':
path = f'/home/{user}/Data/toar_daily/'
diff --git a/test/test_helpers.py b/test/test_helpers.py
index 78e1a34f..cf0bc6b4 100644
--- a/test/test_helpers.py
+++ b/test/test_helpers.py
@@ -140,12 +140,20 @@ class TestTimeTracking:
class TestPrepareHost:
- @mock.patch("socket.gethostname", return_value="linux-gzsx")
+ @mock.patch("socket.gethostname", side_effect=["linux-gzsx", "ZAM144", "zam347", "jrtest", "jwtest"])
@mock.patch("os.getlogin", return_value="testUser")
@mock.patch("os.path.exists", return_value=True)
def test_prepare_host(self, mock_host, mock_user, mock_path):
path = prepare_host()
assert path == "/home/testUser/machinelearningtools"
+ path = prepare_host()
+ assert path == "/home/testUser/Data/toar_daily/"
+ path = prepare_host()
+ assert path == "/home/testUser/Data/toar_daily/"
+ path = prepare_host()
+ assert path == "/p/project/cjjsc42/testUser/DATA/toar_daily/"
+ path = prepare_host()
+ assert path == "/p/home/jusers/testUser/juwels/intelliaq/DATA/toar_daily/"
@mock.patch("socket.gethostname", return_value="NotExistingHostName")
@mock.patch("os.getlogin", return_value="zombie21")
@@ -167,7 +175,7 @@ class TestSetExperimentName:
assert exp_path == os.path.abspath(os.path.join(os.path.dirname(__file__), "..", ""))
exp_name, exp_path = set_experiment_name(experiment_date="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"))
+ assert exp_path == os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "test2"))
def test_set_experiment_from_sys(self):
exp_name, _ = set_experiment_name(experiment_date="2019-11-14")
--
GitLab