From e79ae7bf34097c8650e8581f2dc271a1910a8dc1 Mon Sep 17 00:00:00 2001 From: David Hart Date: Mon, 16 Dec 2024 00:13:36 -0700 Subject: [PATCH] test: Skip v2.0 on ARM processor --- wntr/tests/test_epanet_toolkit.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/wntr/tests/test_epanet_toolkit.py b/wntr/tests/test_epanet_toolkit.py index 75c258e55..a81673b64 100644 --- a/wntr/tests/test_epanet_toolkit.py +++ b/wntr/tests/test_epanet_toolkit.py @@ -1,8 +1,14 @@ import unittest from os.path import abspath, dirname, join, exists +import sys, platform import wntr.epanet.toolkit +if 'darwin' in sys.platform.lower() and 'arm' in platform.platform().lower(): + skip_v2_tests_on_arm = True +else: + skip_v2_tests_on_arm = False + testdir = dirname(abspath(__file__)) datadir = join(testdir, "..", "..", "examples", "networks") @@ -11,6 +17,8 @@ class TestEpanetToolkit(unittest.TestCase): def test_isOpen(self): for version in [2.0, 2.2,]: + if version == 2.0 and skip_v2_tests_on_arm: + continue # skip v2.0 tests on mac silicon processor enData = wntr.epanet.toolkit.ENepanet(version=version) enData.inpfile = join(datadir, "Net1.inp") self.assertEqual(0, enData.isOpen()) @@ -19,6 +27,8 @@ def test_isOpen(self): def test_ENgetcount(self): for version in [2.0, 2.2,]: + if version == 2.0 and skip_v2_tests_on_arm: + continue # skip v2.0 tests on mac silicon processor enData = wntr.epanet.toolkit.ENepanet(version=version) enData.inpfile = join(datadir, "Net1.inp") enData.ENopen(enData.inpfile, "temp.rpt") @@ -30,6 +40,8 @@ def test_ENgetcount(self): def test_ENgetflowunits(self): for version in [2.0, 2.2,]: + if version == 2.0 and skip_v2_tests_on_arm: + continue # skip v2.0 tests on mac silicon processor enData = wntr.epanet.toolkit.ENepanet(version=version) enData.inpfile = join(datadir, "Net1.inp") enData.ENopen(enData.inpfile, "temp.rpt") @@ -39,6 +51,8 @@ def test_ENgetflowunits(self): def test_EN_timeparam(self): for version in [2.0, 2.2,]: + if version == 2.0 and skip_v2_tests_on_arm: + continue # skip v2.0 tests on mac silicon processor enData = wntr.epanet.toolkit.ENepanet(version=version) enData.inpfile = join(datadir, "Net1.inp") enData.ENopen(enData.inpfile, "temp.rpt") @@ -51,6 +65,8 @@ def test_EN_timeparam(self): def test_ENgetindex_ENgetvalue(self): for version in [2.0, 2.2,]: + if version == 2.0 and skip_v2_tests_on_arm: + continue # skip v2.0 tests on mac silicon processor enData = wntr.epanet.toolkit.ENepanet(version=version) enData.inpfile = join(datadir, "Net1.inp") enData.ENopen(enData.inpfile, "temp.rpt") @@ -74,6 +90,8 @@ def test_ENgetindex_ENgetvalue(self): def test_ENsaveinpfile(self): for version in [2.0, 2.2,]: + if version == 2.0 and skip_v2_tests_on_arm: + continue # skip v2.0 tests on mac silicon processor enData = wntr.epanet.toolkit.ENepanet(version=version) enData.inpfile = join(datadir, "Net1.inp") enData.ENopen(enData.inpfile, "temp.rpt") @@ -94,6 +112,8 @@ def test_runepanet(self): def test_runepanet_step(self): for version in [2.0, 2.2,]: + if version == 2.0 and skip_v2_tests_on_arm: + continue # skip v2.0 tests on mac silicon processor enData = wntr.epanet.toolkit.ENepanet(version=version) enData.inpfile = join(datadir, "Net1.inp") enData.ENopen(enData.inpfile, "temp_runepanet_step.rpt", "temp_runepanet_step.bin")