Adds tests for default gpus

apps/crc_interactive.py

@@ -1,4 +1,4 @@
-"""A simple wrapper around the Slurm ``srun`` command
+"""A simple wrapper around the Slurm `srun` command.
 
 The application launches users into an interactive Slurm session on a
 user-selected cluster and (if specified) partition. Dedicated command line
@@ -87,7 +87,7 @@ def __init__(self) -> None:
 
     @staticmethod
     def parse_time(time_str: str) -> time:
-        """Parse a string representation of time in 'HH:MM:SS' format and return a time object
+        """Parse a string representation of time in 'HH:MM:SS' format and return a time object.
 
         Args:
             time_str: A string representing time in 'HH:MM:SS' format.
@@ -110,10 +110,14 @@ def parse_time(time_str: str) -> time:
             raise ArgumentTypeError(f'Could not parse time value {time_str}')
 
     def parse_args(self, args=None, namespace=None) -> Namespace:
-        """Parse command line arguments"""
+        """Parse command line arguments."""
 
         args = super().parse_args(args, namespace)
 
+        # Set defaults that need to be determined dynamically
+        if not args.num_gpus:
+            args.num_gpus = 1 if args.gpu else 0
+
         # Check wall time is between limits, enable both %H:%M format and integer hours
         check_time = args.time.hour + args.time.minute / 60 + args.time.second / 3600
         if not self.min_time <= check_time <= self.max_time:
@@ -137,13 +141,13 @@ def parse_args(self, args=None, namespace=None) -> Namespace:
         return args
 
     def create_srun_command(self, args: Namespace) -> str:
-        """Create an ``srun`` command based on parsed command line arguments
+        """Create an `srun` command based on parsed command line arguments.
 
         Args:
-            args: A dictionary of parsed command line parsed_args
+            args: A dictionary of parsed command line parsed_args.
 
         Return:
-            The equivalent ``srun`` command as a string
+            The equivalent `srun` command as a string.
         """
 
         # Map arguments from the parent application to equivalent srun arguments
@@ -179,20 +183,16 @@ def create_srun_command(self, args: Namespace) -> str:
         return f'srun -M {cluster_to_run} {srun_args} --pty bash'
 
     def app_logic(self, args: Namespace) -> None:
-        """Logic to evaluate when executing the application
+        """Logic to evaluate when executing the application.
 
         Args:
-            args: Parsed command line arguments
+            args: Parsed command line arguments.
         """
 
         if not any(getattr(args, cluster, False) for cluster in Slurm.get_cluster_names()):
             self.print_help()
             self.exit()
 
-        # Set defaults that need to be determined dynamically
-        if not args.num_gpus:
-            args.num_gpus = 1 if args.gpu else 0
-
         # Create the slurm command
         srun_command = self.create_srun_command(args)
 

tests/test_crc_interactive.py

@@ -1,4 +1,4 @@
-"""Tests for the ``crc-interactive`` application."""
+"""Tests for the `crc-interactive` application."""
 
 from argparse import ArgumentTypeError, Namespace
 from datetime import time
@@ -25,6 +25,15 @@ def test_args_match_class_settings(self) -> None:
         self.assertEqual(CrcInteractive.default_mem, args.mem)
         self.assertEqual(CrcInteractive.default_gpus, args.num_gpus)
 
+    def test_default_gpus(self) -> None:
+        """Test the default number of GPUs is determined dynamically by cluster."""
+
+        smp_args = self.app.parse_args(['--smp'])
+        self.assertEqual(0, smp_args.num_gpus)
+
+        gpu_args = self.app.parse_args(['--gpu'])
+        self.assertEqual(1, gpu_args.num_gpus)
+
     def test_time_argument_out_of_range(self) -> None:
         """Test invalid time arguments raise an error."""