tests: adapt to new apps defaults module

rezib · rezib · commit a396fbf418fe · 2025-12-19T10:02:03.000+01:00
diff --git a/slurmweb/tests/exec/test_agent.py b/slurmweb/tests/exec/test_agent.py
@@ -13,7 +13,7 @@
 from slurmweb.exec.main import SlurmwebExecMain
 from slurmweb.exec.agent import SlurmwebExecAgent
 from slurmweb.apps import SlurmwebAppSeed
-from slurmweb.apps.agent import SlurmwebAppAgent
+from slurmweb.apps._defaults import SlurmwebAppDefaults
 
 
 class TestAgentExec(unittest.TestCase):
@@ -29,9 +29,11 @@ def test_seed_no_args(self):
         self.assertEqual(seed.log_component, None)
         self.assertEqual(seed.debug_flags, "slurmweb")
         self.assertIsInstance(seed.conf_defs, Path)
-        self.assertEqual(seed.conf_defs, Path(SlurmwebAppAgent.SETTINGS_DEFINITION))
+        self.assertEqual(
+            seed.conf_defs, Path(SlurmwebAppDefaults.AGENT.settings_definition)
+        )
         self.assertIsInstance(seed.conf, Path)
-        self.assertEqual(seed.conf, Path(SlurmwebAppAgent.SITE_CONFIGURATION))
+        self.assertEqual(seed.conf, Path(SlurmwebAppDefaults.AGENT.site_configuration))
 
     def test_seed_version(self):
         with mock.patch("sys.stdout", new=io.StringIO()) as stdout:
@@ -57,7 +59,7 @@ def test_seed_wrong_args(self):
         with self.assertRaisesRegex(SystemExit, "2"):
             self._parse(["--fail"])
 
-    @mock.patch("slurmweb.exec.agent.SlurmwebAppAgent")
+    @mock.patch("slurmweb.apps.agent.SlurmwebAppAgent")
     def test_app(self, mock_slurmweb_app):
         seed = self._parse([])
         app = SlurmwebExecAgent.app(seed)
diff --git a/slurmweb/tests/exec/test_connect.py b/slurmweb/tests/exec/test_connect.py
@@ -13,7 +13,7 @@
 from slurmweb.exec.main import SlurmwebExecMain
 from slurmweb.exec.connect import SlurmwebExecConnectCheck
 from slurmweb.apps import SlurmwebAppSeed
-from slurmweb.apps.agent import SlurmwebAppAgent
+from slurmweb.apps._defaults import SlurmwebAppDefaults
 
 
 class TestConnectCheckExec(unittest.TestCase):
@@ -29,9 +29,11 @@ def test_seed_no_args(self):
         self.assertEqual(seed.log_component, None)
         self.assertEqual(seed.debug_flags, "slurmweb")
         self.assertIsInstance(seed.conf_defs, Path)
-        self.assertEqual(seed.conf_defs, Path(SlurmwebAppAgent.SETTINGS_DEFINITION))
+        self.assertEqual(
+            seed.conf_defs, Path(SlurmwebAppDefaults.AGENT.settings_definition)
+        )
         self.assertIsInstance(seed.conf, Path)
-        self.assertEqual(seed.conf, Path(SlurmwebAppAgent.SITE_CONFIGURATION))
+        self.assertEqual(seed.conf, Path(SlurmwebAppDefaults.AGENT.site_configuration))
 
     def test_seed_version(self):
         with mock.patch("sys.stdout", new=io.StringIO()) as stdout:
@@ -57,7 +59,7 @@ def test_seed_wrong_args(self):
         with self.assertRaisesRegex(SystemExit, "2"):
             self._parse(["--fail"])
 
-    @mock.patch("slurmweb.exec.connect.SlurmwebAppConnectCheck")
+    @mock.patch("slurmweb.apps.connect.SlurmwebAppConnectCheck")
     def test_app(self, mock_slurmweb_app):
         seed = self._parse([])
         app = SlurmwebExecConnectCheck.app(seed)
diff --git a/slurmweb/tests/exec/test_gateway.py b/slurmweb/tests/exec/test_gateway.py
@@ -13,7 +13,7 @@
 from slurmweb.exec.main import SlurmwebExecMain
 from slurmweb.exec.gateway import SlurmwebExecGateway
 from slurmweb.apps import SlurmwebAppSeed
-from slurmweb.apps.gateway import SlurmwebAppGateway
+from slurmweb.apps._defaults import SlurmwebAppDefaults
 
 
 class TestGatewayExec(unittest.TestCase):
@@ -29,9 +29,13 @@ def test_seed_no_args(self):
         self.assertEqual(seed.log_component, None)
         self.assertEqual(seed.debug_flags, "slurmweb")
         self.assertIsInstance(seed.conf_defs, Path)
-        self.assertEqual(seed.conf_defs, Path(SlurmwebAppGateway.SETTINGS_DEFINITION))
+        self.assertEqual(
+            seed.conf_defs, Path(SlurmwebAppDefaults.GATEWAY.settings_definition)
+        )
         self.assertIsInstance(seed.conf, Path)
-        self.assertEqual(seed.conf, Path(SlurmwebAppGateway.SITE_CONFIGURATION))
+        self.assertEqual(
+            seed.conf, Path(SlurmwebAppDefaults.GATEWAY.site_configuration)
+        )
 
     def test_seed_version(self):
         with mock.patch("sys.stdout", new=io.StringIO()) as stdout:
@@ -57,7 +61,7 @@ def test_seed_wrong_args(self):
         with self.assertRaisesRegex(SystemExit, "2"):
             self._parse(["--fail"])
 
-    @mock.patch("slurmweb.exec.gateway.SlurmwebAppGateway")
+    @mock.patch("slurmweb.apps.gateway.SlurmwebAppGateway")
     def test_app(self, mock_slurmweb_app):
         seed = self._parse([])
         app = SlurmwebExecGateway.app(seed)
diff --git a/slurmweb/tests/exec/test_genjwt.py b/slurmweb/tests/exec/test_genjwt.py
@@ -13,7 +13,7 @@
 from slurmweb.exec.main import SlurmwebExecMain
 from slurmweb.exec.genjwt import SlurmwebExecGenJWT
 from slurmweb.apps import SlurmwebAppSeed
-from slurmweb.apps.gateway import SlurmwebAppGateway
+from slurmweb.apps._defaults import SlurmwebAppDefaults
 
 
 class TestGenJWTExec(unittest.TestCase):
@@ -29,9 +29,13 @@ def test_seed_no_args(self):
         self.assertEqual(seed.log_component, None)
         self.assertEqual(seed.debug_flags, "slurmweb")
         self.assertIsInstance(seed.conf_defs, Path)
-        self.assertEqual(seed.conf_defs, Path(SlurmwebAppGateway.SETTINGS_DEFINITION))
+        self.assertEqual(
+            seed.conf_defs, Path(SlurmwebAppDefaults.GATEWAY.settings_definition)
+        )
         self.assertIsInstance(seed.conf, Path)
-        self.assertEqual(seed.conf, Path(SlurmwebAppGateway.SITE_CONFIGURATION))
+        self.assertEqual(
+            seed.conf, Path(SlurmwebAppDefaults.GATEWAY.site_configuration)
+        )
         self.assertEqual(seed.with_slurm, False)
 
     def test_seed_version(self):
@@ -63,7 +67,7 @@ def test_seed_wrong_args(self):
         with self.assertRaisesRegex(SystemExit, "2"):
             self._parse(["--fail"])
 
-    @mock.patch("slurmweb.exec.genjwt.SlurmwebAppGenJWT")
+    @mock.patch("slurmweb.apps.genjwt.SlurmwebAppGenJWT")
     def test_app(self, mock_slurmweb_app):
         seed = self._parse([])
         app = SlurmwebExecGenJWT.app(seed)
diff --git a/slurmweb/tests/exec/test_ldap.py b/slurmweb/tests/exec/test_ldap.py
@@ -13,7 +13,7 @@
 from slurmweb.exec.main import SlurmwebExecMain
 from slurmweb.exec.ldap import SlurmwebExecLDAPCheck
 from slurmweb.apps import SlurmwebAppSeed
-from slurmweb.apps.gateway import SlurmwebAppGateway
+from slurmweb.apps._defaults import SlurmwebAppDefaults
 
 
 class TestLDAPCheckExec(unittest.TestCase):
@@ -29,9 +29,13 @@ def test_seed_no_args(self):
         self.assertEqual(seed.log_component, None)
         self.assertEqual(seed.debug_flags, "slurmweb")
         self.assertIsInstance(seed.conf_defs, Path)
-        self.assertEqual(seed.conf_defs, Path(SlurmwebAppGateway.SETTINGS_DEFINITION))
+        self.assertEqual(
+            seed.conf_defs, Path(SlurmwebAppDefaults.GATEWAY.settings_definition)
+        )
         self.assertIsInstance(seed.conf, Path)
-        self.assertEqual(seed.conf, Path(SlurmwebAppGateway.SITE_CONFIGURATION))
+        self.assertEqual(
+            seed.conf, Path(SlurmwebAppDefaults.GATEWAY.site_configuration)
+        )
 
     def test_seed_version(self):
         with mock.patch("sys.stdout", new=io.StringIO()) as stdout:
@@ -57,7 +61,7 @@ def test_seed_wrong_args(self):
         with self.assertRaisesRegex(SystemExit, "2"):
             self._parse(["--fail"])
 
-    @mock.patch("slurmweb.exec.ldap.SlurmwebAppLDAPCheck")
+    @mock.patch("slurmweb.apps.ldap.SlurmwebAppLDAPCheck")
     def test_app(self, mock_slurmweb_app):
         seed = self._parse([])
         app = SlurmwebExecLDAPCheck.app(seed)
diff --git a/slurmweb/tests/exec/test_main.py b/slurmweb/tests/exec/test_main.py
@@ -45,7 +45,7 @@ def test_run_invalid_subcommand(self):
             # Check error about invalid subcommand
             self.assertIn("invalid-subcommand", stderr.getvalue())
 
-    @mock.patch("slurmweb.exec.agent.SlurmwebAppAgent")
+    @mock.patch("slurmweb.apps.agent.SlurmwebAppAgent")
     def test_run_with_subcommand_agent(self, mock_slurmweb_app):
         """Test that run() correctly delegates to agent subcommand."""
         mock_app_instance = mock.Mock()
diff --git a/slurmweb/tests/exec/test_showconf.py b/slurmweb/tests/exec/test_showconf.py
@@ -13,7 +13,7 @@
 from slurmweb.exec.main import SlurmwebExecMain
 from slurmweb.exec.showconf import SlurmwebExecShowConf
 from slurmweb.apps import SlurmwebAppSeed
-from slurmweb.apps.gateway import SlurmwebAppGateway
+from slurmweb.apps._defaults import SlurmwebAppDefaults
 
 
 class TestShowConfExec(unittest.TestCase):
@@ -71,7 +71,7 @@ def test_seed_wrong_args(self):
         with self.assertRaisesRegex(SystemExit, "2"):
             self._parse(["--fail"])
 
-    @mock.patch("slurmweb.exec.showconf.SlurmwebAppShowConf")
+    @mock.patch("slurmweb.apps.showconf.SlurmwebAppShowConf")
     def test_app(self, mock_slurmweb_app):
         seed = self._parse(["gateway"])
         app = SlurmwebExecShowConf.app(seed)
@@ -80,7 +80,11 @@ def test_app(self, mock_slurmweb_app):
         called_seed = mock_slurmweb_app.call_args[0][0]
         self.assertIsInstance(called_seed, SlurmwebAppSeed)
         self.assertEqual(
-            called_seed.conf_defs, Path(SlurmwebAppGateway.SETTINGS_DEFINITION)
+            called_seed.conf_defs,
+            Path(SlurmwebAppDefaults.GATEWAY.settings_definition),
+        )
+        self.assertEqual(
+            called_seed.conf,
+            Path(SlurmwebAppDefaults.GATEWAY.site_configuration),
         )
-        self.assertEqual(called_seed.conf, Path(SlurmwebAppGateway.SITE_CONFIGURATION))
         self.assertEqual(app, mock_slurmweb_app.return_value)
