Copy testing options when used in model arguments to prevent changes from persisting between tests.

Don't skip the wait in recv filter test for ForkComm as the filtering takes places on the receive call, even for async comms

Author: langmm

tests/communication/test_ForkComm.py

@@ -117,10 +117,12 @@ def test_send_recv_filter_recv_filter(self, filtered_comms,
                                           recv_comm, polling_interval,
                                           do_send_recv):
         r"""Test send/recv with filter that blocks recv."""
-        # Wait if not async?
         do_send_recv(send_comm, recv_comm, msg_filter_recv,
                      recv_params={'message': recv_comm.empty_obj_recv,
-                                  'skip_wait': True,
+                                  # Don't need to skip since
+                                  # filter is evaluated after
+                                  # receipt for fork comm
+                                  'skip_wait': False,
                                   'count': 1,
                                   'kwargs': {'timeout': 10 * polling_interval}})
 

tests/drivers/test_CompiledModelDriver.py

@@ -192,17 +192,21 @@ def compiler(self, python_class):
     def instance_args(self, name, source, testing_options, compiler,
                       is_installed):
         r"""Arguments for a new instance of the tested class."""
-        return tuple([name, ([compiler.get_output_file(source[0])]
-                             + testing_options.get('args', []))])
+        return tuple(
+            [name, ([compiler.get_output_file(source[0])]
+                    + copy.deepcopy(
+                        testing_options.get('args', [])))])
 
     @pytest.fixture
     def instance_kwargs(self, testing_options, timeout, working_dir,
                         polling_interval, namespace, source):
         r"""Keyword arguments for a new instance of the tested class."""
-        return dict(testing_options.get('kwargs', {}),
-                    yml={'working_dir': working_dir},
-                    timeout=timeout, sleeptime=polling_interval,
-                    namespace=namespace, source_files=source)
+        return dict(
+            copy.deepcopy(
+                testing_options.get('kwargs', {})),
+            yml={'working_dir': working_dir},
+            timeout=timeout, sleeptime=polling_interval,
+            namespace=namespace, source_files=source)
 
     @pytest.fixture
     def run_model_instance_kwargs(self):

tests/drivers/test_ModelDriver.py

@@ -88,7 +88,9 @@ def working_dir(self, source):
     @pytest.fixture
     def instance_args(self, name, source, testing_options):
         r"""Arguments for a new instance of the tested class."""
-        return tuple([name, source + testing_options.get('args', [])])
+        return tuple(
+            [name, source + copy.deepcopy(
+                testing_options.get('args', []))])
 
     @pytest.fixture(scope="class")
     def python_class_installed(self, python_class):