From a5b93135caf4c83cfe98acf78fee728c0821a8f5 Mon Sep 17 00:00:00 2001
From: Bert Palm <bert.palm@ufz.de>
Date: Thu, 11 Feb 2021 18:39:43 +0100
Subject: [PATCH] simplyfied tests
---
test/flagger/test_history.py | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/test/flagger/test_history.py b/test/flagger/test_history.py
index 47c130651..f4c068ef7 100644
--- a/test/flagger/test_history.py
+++ b/test/flagger/test_history.py
@@ -194,12 +194,11 @@ def __hist():
@pytest.mark.parametrize('s, max_val', [
- (pd.Series(val, index=range(6), dtype=float), max_val)
- for val, max_val
- in zip(
- [0, 1, np.nan, 1, 0],
- [0, 1, 1, 1, 1] # expected max-val
- )
+ (pd.Series(0, index=range(6), dtype=float), 0),
+ (pd.Series(1, index=range(6), dtype=float), 1),
+ (pd.Series(np.nan, index=range(6), dtype=float), 1),
+ (pd.Series(1, index=range(6), dtype=float), 1),
+ (pd.Series(0, index=range(6), dtype=float), 1),
])
def test_append(__hist, s, max_val):
hist = __hist
@@ -211,12 +210,10 @@ def test_append(__hist, s, max_val):
# this test append more rows to the resulting
# FH from the former test
@pytest.mark.parametrize('s, max_val', [
- (pd.Series(val, index=range(6), dtype=float), max_val)
- for val, max_val
- in zip(
- [0, 1, np.nan, 0],
- [0, 1, 1, 0], # expected max-val
- )
+ (pd.Series(0, index=range(6), dtype=float), 0),
+ (pd.Series(1, index=range(6), dtype=float), 1),
+ (pd.Series(np.nan, index=range(6), dtype=float), 1),
+ (pd.Series(0, index=range(6), dtype=float), 0),
])
def test_append_force(__hist, s, max_val):
hist = __hist
--
GitLab