waltsims#592: added windows guard in tests.

Author: precicely

kwave/options/simulation_execution_options.py

@@ -188,9 +188,6 @@ def as_list(self, sensor: kSensor) -> list[str]:
             options_list.append("--verbose")
             options_list.append(str(self.verbose_level))
 
-        if self.checkpoint_interval is not None and self.checkpoint_timesteps is not None:
-            logger.warning("Both checkpoint_interval and checkpoint_timesteps have been set. Kwave defaults to checkpoint_interval")
-
         if (self.checkpoint_interval is not None or self.checkpoint_timesteps is not None) and self.checkpoint_file is not None:
             if self.checkpoint_timesteps is not None:
                 if not isinstance(self.checkpoint_timesteps, int) or self.checkpoint_timesteps < 0:
@@ -205,9 +202,9 @@ def as_list(self, sensor: kSensor) -> list[str]:
 
             p = Path(self.checkpoint_file)
             if not p.parent.exists():
-                raise ValueError(f"Checkpoint directory {p.parent} does not exist." "Please create it before running the simulation.")
+                raise ValueError(f"Checkpoint directory {p.parent} does not exist. Please create it before running the simulation.")
             if p.suffix != ".h5":
-                raise ValueError(f"Checkpoint file {p.name} must have .h5 " "extension. Please rename it before running the simulation.")
+                raise ValueError(f"Checkpoint file {p.name} must have .h5 extension. Please rename it before running the simulation.")
 
             options_list.append("--checkpoint_file")
             options_list.append(str(self.checkpoint_file))

tests/test_simulation_execution_options.py

@@ -219,14 +219,12 @@ def test_list_compared_to_string(self):
     def test_as_list_with_valid_checkpoint_interval_options(self):
         """Test the checkpoint interval options."""
         options = self.default_options
-        options.num_threads = os.cpu_count()
+        options.num_threads = 1
         options.checkpoint_interval = 10
         options.checkpoint_file = "checkpoint.h5"
 
         options_list = options.as_list(self.mock_sensor)
         expected_elements = [
-            "-t",
-            str(os.cpu_count()),
             "--checkpoint_interval",
             "10",
             "--checkpoint_file",
@@ -236,19 +234,20 @@ def test_as_list_with_valid_checkpoint_interval_options(self):
             "-s",
             "10",
         ]
+        if not PLATFORM == "windows":
+            expected_elements.insert(0, "-t")
+            expected_elements.insert(1, f"1")
         self.assertListEqual(expected_elements, options_list)
 
     def test_as_list_with_valid_checkpoint_timesteps_options(self):
         """Test the checkpoint interval options."""
         options = self.default_options
-        options.num_threads = os.cpu_count()
+        options.num_threads = 1
         options.checkpoint_timesteps = 10
         options.checkpoint_file = "checkpoint.h5"
 
         options_list = options.as_list(self.mock_sensor)
         expected_elements = [
-            "-t",
-            str(os.cpu_count()),
             "--checkpoint_timesteps",
             "10",
             "--checkpoint_file",
@@ -258,6 +257,9 @@ def test_as_list_with_valid_checkpoint_timesteps_options(self):
             "-s",
             "10",
         ]
+        if not PLATFORM == "windows":
+            expected_elements.insert(0, "-t")
+            expected_elements.insert(1, f"1")
         self.assertListEqual(expected_elements, options_list)