fix: sys.modules in parallel tests

Author: kshitij-maths

tests/test_parallel.py

@@ -1,3 +1,2 @@
 import matplotlib
-
-matplotlib.use("Agg")
+matplotlib.use('Agg')

tests/test_parallel/__init__.py

@@ -1,20 +1,22 @@
 import unittest
 import pytest
 import sys
-from unittest import mock
 
 try:
     from ezyrb.parallel import ReducedOrderModel as ParallelROM
-    import tests.test_ae as original_module
+    import tests.test_ae as serial_module
     HAS_PARALLEL = True
 except ImportError:
     HAS_PARALLEL = False
 
 if not HAS_PARALLEL:
-    raise unittest.SkipTest("Parallel dependencies missing")
+    raise unittest.SkipTest("Parallel dependencies (pycompss/pyeddl) missing")
+
+serial_module.ROM = ParallelROM
+if hasattr(serial_module, 'ReducedOrderModel'):
+    serial_module.ReducedOrderModel = ParallelROM
+
+sys.modules['tests.test_ae'] = serial_module
 
-original_module.ROM = ParallelROM
-if hasattr(original_module, 'ReducedOrderModel'):
-    original_module.ReducedOrderModel = ParallelROM
 
 from tests.test_ae import *

tests/test_parallel/test_ae.py

@@ -1,20 +1,22 @@
 import unittest
 import pytest
 import sys
-from unittest import mock
 
 try:
     from ezyrb.parallel import ReducedOrderModel as ParallelROM
-    import tests.test_ann as original_module
+    import tests.test_ann as serial_module
     HAS_PARALLEL = True
 except ImportError:
     HAS_PARALLEL = False
 
 if not HAS_PARALLEL:
-    raise unittest.SkipTest("Parallel dependencies missing")
+    raise unittest.SkipTest("Parallel dependencies (pycompss/pyeddl) missing")
+
+serial_module.ROM = ParallelROM
+if hasattr(serial_module, 'ReducedOrderModel'):
+    serial_module.ReducedOrderModel = ParallelROM
+
+sys.modules['tests.test_ann'] = serial_module
 
-original_module.ROM = ParallelROM
-if hasattr(original_module, 'ReducedOrderModel'):
-    original_module.ReducedOrderModel = ParallelROM
 
 from tests.test_ann import *

tests/test_parallel/test_ann.py

@@ -1,20 +1,22 @@
 import unittest
 import pytest
 import sys
-from unittest import mock
 
 try:
     from ezyrb.parallel import ReducedOrderModel as ParallelROM
-    import tests.test_approximation as original_module
+    import tests.test_approximation as serial_module
     HAS_PARALLEL = True
 except ImportError:
     HAS_PARALLEL = False
 
 if not HAS_PARALLEL:
-    raise unittest.SkipTest("Parallel dependencies missing")
+    raise unittest.SkipTest("Parallel dependencies (pycompss/pyeddl) missing")
+
+serial_module.ROM = ParallelROM
+if hasattr(serial_module, 'ReducedOrderModel'):
+    serial_module.ReducedOrderModel = ParallelROM
+
+sys.modules['tests.test_approximation'] = serial_module
 
-original_module.ROM = ParallelROM
-if hasattr(original_module, 'ReducedOrderModel'):
-    original_module.ReducedOrderModel = ParallelROM
 
 from tests.test_approximation import *

tests/test_parallel/test_approximation.py

@@ -1,20 +1,22 @@
 import unittest
 import pytest
 import sys
-from unittest import mock
 
 try:
     from ezyrb.parallel import ReducedOrderModel as ParallelROM
-    import tests.test_database as original_module
+    import tests.test_database as serial_module
     HAS_PARALLEL = True
 except ImportError:
     HAS_PARALLEL = False
 
 if not HAS_PARALLEL:
-    raise unittest.SkipTest("Parallel dependencies missing")
+    raise unittest.SkipTest("Parallel dependencies (pycompss/pyeddl) missing")
+
+serial_module.ROM = ParallelROM
+if hasattr(serial_module, 'ReducedOrderModel'):
+    serial_module.ReducedOrderModel = ParallelROM
+
+sys.modules['tests.test_database'] = serial_module
 
-original_module.ROM = ParallelROM
-if hasattr(original_module, 'ReducedOrderModel'):
-    original_module.ReducedOrderModel = ParallelROM
 
 from tests.test_database import *

tests/test_parallel/test_database.py

@@ -1,20 +1,22 @@
 import unittest
 import pytest
 import sys
-from unittest import mock
 
 try:
     from ezyrb.parallel import ReducedOrderModel as ParallelROM
-    import tests.test_gpr as original_module
+    import tests.test_gpr as serial_module
     HAS_PARALLEL = True
 except ImportError:
     HAS_PARALLEL = False
 
 if not HAS_PARALLEL:
-    raise unittest.SkipTest("Parallel dependencies missing")
+    raise unittest.SkipTest("Parallel dependencies (pycompss/pyeddl) missing")
+
+serial_module.ROM = ParallelROM
+if hasattr(serial_module, 'ReducedOrderModel'):
+    serial_module.ReducedOrderModel = ParallelROM
+
+sys.modules['tests.test_gpr'] = serial_module
 
-original_module.ROM = ParallelROM
-if hasattr(original_module, 'ReducedOrderModel'):
-    original_module.ReducedOrderModel = ParallelROM
 
 from tests.test_gpr import *

tests/test_parallel/test_gpr.py

@@ -1,20 +1,22 @@
 import unittest
 import pytest
 import sys
-from unittest import mock
 
 try:
     from ezyrb.parallel import ReducedOrderModel as ParallelROM
-    import tests.test_k_neighbors_regressor as original_module
+    import tests.test_k_neighbors_regressor as serial_module
     HAS_PARALLEL = True
 except ImportError:
     HAS_PARALLEL = False
 
 if not HAS_PARALLEL:
-    raise unittest.SkipTest("Parallel dependencies missing")
+    raise unittest.SkipTest("Parallel dependencies (pycompss/pyeddl) missing")
+
+serial_module.ROM = ParallelROM
+if hasattr(serial_module, 'ReducedOrderModel'):
+    serial_module.ReducedOrderModel = ParallelROM
+
+sys.modules['tests.test_k_neighbors_regressor'] = serial_module
 
-original_module.ROM = ParallelROM
-if hasattr(original_module, 'ReducedOrderModel'):
-    original_module.ReducedOrderModel = ParallelROM
 
 from tests.test_k_neighbors_regressor import *

tests/test_parallel/test_k_neighbors_regressor.py

@@ -1,20 +1,22 @@
 import unittest
 import pytest
 import sys
-from unittest import mock
 
 try:
     from ezyrb.parallel import ReducedOrderModel as ParallelROM
-    import tests.test_linear as original_module
+    import tests.test_linear as serial_module
     HAS_PARALLEL = True
 except ImportError:
     HAS_PARALLEL = False
 
 if not HAS_PARALLEL:
-    raise unittest.SkipTest("Parallel dependencies missing")
+    raise unittest.SkipTest("Parallel dependencies (pycompss/pyeddl) missing")
+
+serial_module.ROM = ParallelROM
+if hasattr(serial_module, 'ReducedOrderModel'):
+    serial_module.ReducedOrderModel = ParallelROM
+
+sys.modules['tests.test_linear'] = serial_module
+
 
-original_module.ROM = ParallelROM
-if hasattr(original_module, 'ReducedOrderModel'):
-    original_module.ReducedOrderModel = ParallelROM
-    
 from tests.test_linear import *

tests/test_parallel/test_linear.py

@@ -1,20 +1,22 @@
 import unittest
 import pytest
 import sys
-from unittest import mock
 
 try:
     from ezyrb.parallel import ReducedOrderModel as ParallelROM
-    import tests.test_nnshift as original_module
+    import tests.test_nnshift as serial_module
     HAS_PARALLEL = True
 except ImportError:
     HAS_PARALLEL = False
 
 if not HAS_PARALLEL:
-    raise unittest.SkipTest("Parallel dependencies missing")
+    raise unittest.SkipTest("Parallel dependencies (pycompss/pyeddl) missing")
+
+serial_module.ROM = ParallelROM
+if hasattr(serial_module, 'ReducedOrderModel'):
+    serial_module.ReducedOrderModel = ParallelROM
+
+sys.modules['tests.test_nnshift'] = serial_module
 
-original_module.ROM = ParallelROM
-if hasattr(original_module, 'ReducedOrderModel'):
-    original_module.ReducedOrderModel = ParallelROM
 
 from tests.test_nnshift import *