From 3389893af0f550437b88d1a2b69cbfd1506fcc3f Mon Sep 17 00:00:00 2001
From: Martin Lange <martin.lange@ufz.de>
Date: Tue, 29 Nov 2022 09:50:16 +0100
Subject: [PATCH] fix tests for shared memory check
---
tests/adapters/test_regrid.py | 16 ++++++++--------
tests/core/test_schedule.py | 2 +-
tests/core/test_sdk.py | 16 +++++-----------
tests/core/test_units.py | 2 +-
4 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/tests/adapters/test_regrid.py b/tests/adapters/test_regrid.py
index 49f0b542..e2013602 100644
--- a/tests/adapters/test_regrid.py
+++ b/tests/adapters/test_regrid.py
@@ -61,7 +61,7 @@ class TestRegrid(unittest.TestCase):
(source.outputs["Output"] >> RegridNearest() >> sink.inputs["Input"])
- composition.run(end_time=datetime(2000, 1, 5))
+ composition.connect()
self.assertEqual(sink.inputs["Input"].info.grid, out_spec)
self.assertEqual(sink.data["Input"][0, 0, 0], 1.0 * UNITS.meter)
@@ -114,7 +114,7 @@ class TestRegrid(unittest.TestCase):
(source.outputs["Output"] >> RegridNearest() >> sink.inputs["Input"])
- composition.run(end_time=datetime(2000, 1, 2))
+ composition.connect()
self.assertEqual(sink.inputs["Input"].info.grid, out_spec)
self.assertEqual(sink.data["Input"][0, 0, 0], 1.0 * UNITS.meter)
@@ -158,7 +158,7 @@ class TestRegrid(unittest.TestCase):
(source.outputs["Output"] >> RegridLinear() >> sink.inputs["Input"])
- composition.run(end_time=datetime(2000, 1, 2))
+ composition.connect()
self.assertEqual(sink.inputs["Input"].info.grid, out_spec)
self.assertEqual(sink.data["Input"][0, 0, 0], 1.0 * UNITS.meter)
@@ -206,7 +206,7 @@ class TestRegrid(unittest.TestCase):
>> sink.inputs["Input"]
)
- composition.run(end_time=datetime(2000, 1, 2))
+ composition.connect()
self.assertEqual(sink.inputs["Input"].info.grid, out_spec)
self.assertAlmostEqual(fdata.get_magnitude(sink.data["Input"])[0, 0, 0], 1.0)
@@ -251,7 +251,7 @@ class TestRegrid(unittest.TestCase):
>> sink.inputs["Input"]
)
- composition.run(end_time=datetime(2000, 1, 2))
+ composition.connect()
self.assertEqual(sink.inputs["Input"].info.grid, out_spec)
self.assertEqual(sink.data["Input"][0, 0, 0], 1.0 * UNITS.meter)
@@ -291,7 +291,7 @@ class TestRegrid(unittest.TestCase):
(source.outputs["Output"] >> RegridLinear() >> sink.inputs["Input"])
- composition.run(end_time=datetime(2000, 1, 2))
+ composition.connect()
self.assertEqual(sink.inputs["Input"].info.grid, out_spec)
self.assertEqual(sink.data["Input"][0, 0, 0], 1.0 * UNITS.meter)
@@ -340,7 +340,7 @@ class TestRegrid(unittest.TestCase):
regrid >> sink_1.inputs["Input"]
regrid >> sink_2.inputs["Input"]
- composition.run(end_time=datetime(2000, 1, 2))
+ composition.connect()
self.assertEqual(sink_1.inputs["Input"].info.grid, out_spec_1)
self.assertEqual(sink_1.data["Input"][0, 0, 0], 1.0 * UNITS.meter)
@@ -448,7 +448,7 @@ class TestRegrid(unittest.TestCase):
>> sink.inputs["Input"]
)
- composition.run(end_time=datetime(2000, 1, 2))
+ composition.connect()
self.assertEqual(sink.inputs["Input"].info.grid, out_spec)
self.assertEqual(sink.data["Input"][0, 0], 1.0 * UNITS.meter)
diff --git a/tests/core/test_schedule.py b/tests/core/test_schedule.py
index ad7d5ae8..d81dab5d 100644
--- a/tests/core/test_schedule.py
+++ b/tests/core/test_schedule.py
@@ -160,8 +160,8 @@ class MockupCircularComponent(TimeComponent):
pass
def _update(self):
- pulled = self.inputs["Input"].pull_data(self.time)
self._time += self._step
+ pulled = self.inputs["Input"].pull_data(self.time)
self.outputs["Output"].push_data(
tools.get_data(tools.strip_time(pulled)), self.time
)
diff --git a/tests/core/test_sdk.py b/tests/core/test_sdk.py
index 7da839fe..86f9f471 100644
--- a/tests/core/test_sdk.py
+++ b/tests/core/test_sdk.py
@@ -184,7 +184,7 @@ class TestOutput(unittest.TestCase):
with self.assertRaises(FinamNoDataError):
out.push_data(100, t)
- self._out_infos_exchanged = 1
+ out._out_infos_exchanged = 1
out.get_info(info)
@@ -374,11 +374,8 @@ class TestOutput(unittest.TestCase):
in_data = fm.data.full(0.0, "test", info, t)
out.push_data(in_data, t)
- out_data = in1.pull_data(t, in1)
-
- self.assertEqual(out_data[0, 0, 0], 0.0)
- in_data[0, 0, 0] = 1.0
- self.assertEqual(out_data[0, 0, 0], 0.0)
+ with self.assertRaises(FinamDataError):
+ out.push_data(in_data, t)
def test_data_copied_xarray_units(self):
t = datetime(2000, 1, 1)
@@ -419,11 +416,8 @@ class TestOutput(unittest.TestCase):
in_data = fm.data.strip_data(fm.data.full(0.0, "test", info, t))
out.push_data(in_data, t)
- out_data = in1.pull_data(t, in1)
-
- self.assertEqual(out_data[0, 0, 0], 0.0)
- in_data[0, 0] = 1.0
- self.assertEqual(out_data[0, 0, 0], 0.0)
+ with self.assertRaises(FinamDataError):
+ out.push_data(in_data, t)
def test_data_copied_numpy_units(self):
t = datetime(2000, 1, 1)
diff --git a/tests/core/test_units.py b/tests/core/test_units.py
index d0ba6844..08dc807d 100644
--- a/tests/core/test_units.py
+++ b/tests/core/test_units.py
@@ -80,7 +80,7 @@ class TestUnits(unittest.TestCase):
(source.outputs["Output"] >> sink.inputs["Input"])
- composition.run(start_time=time, end_time=datetime(2000, 1, 2))
+ composition.connect()
self.assertEqual(sink.inputs["Input"].info.meta, {"units": UNITS.kilometer})
self.assertEqual(tools.get_units(sink.data), UNITS.kilometer)
--
GitLab