2623 - finish testing action mask

tests/e2e_integration_tests/action_masking/test_agents_use_action_masks.py

@@ -15,8 +15,6 @@ from primaite.session.environment import PrimaiteGymEnv
 from primaite.session.ray_envs import PrimaiteRayEnv, PrimaiteRayMARLEnv
 from tests import TEST_ASSETS_ROOT
 
-init(local_mode=True)
-
 CFG_PATH = TEST_ASSETS_ROOT / "configs/test_primaite_session.yaml"
 MARL_PATH = TEST_ASSETS_ROOT / "configs/multi_agent_session.yaml"
 

tests/e2e_integration_tests/environments/test_rllib_multi_agent_environment.py

@@ -16,8 +16,6 @@ def test_rllib_multi_agent_compatibility():
     with open(MULTI_AGENT_PATH, "r") as f:
         cfg = yaml.safe_load(f)
 
-    ray.init()
-
     config = (
         PPOConfig()
         .environment(env=PrimaiteRayMARLEnv, env_config=cfg)
@@ -39,4 +37,3 @@ def test_rllib_multi_agent_compatibility():
         ),
         param_space=config,
     ).fit()
-    ray.shutdown()

tests/e2e_integration_tests/environments/test_rllib_single_agent_environment.py

@@ -20,9 +20,6 @@ def test_rllib_single_agent_compatibility():
 
     game = PrimaiteGame.from_config(cfg)
 
-    ray.shutdown()
-    ray.init()
-
     env_config = {"game": game}
     config = {
         "env": PrimaiteRayEnv,
@@ -41,4 +38,3 @@ def test_rllib_single_agent_compatibility():
     assert save_file.exists()
 
     save_file.unlink()  # clean up
-    ray.shutdown()

tests/e2e_integration_tests/test_environment.py

@@ -65,25 +65,25 @@ class TestPrimaiteEnvironment:
             cfg = yaml.safe_load(f)
         env = PrimaiteRayMARLEnv(env_config=cfg)
 
-        assert set(env._agent_ids) == {"defender1", "defender2"}
+        assert set(env._agent_ids) == {"defender_1", "defender_2"}
 
         assert len(env.agents) == 2
-        defender1 = env.agents["defender1"]
-        defender2 = env.agents["defender2"]
-        assert (num_actions_1 := len(defender1.action_manager.action_map)) == 54
-        assert (num_actions_2 := len(defender2.action_manager.action_map)) == 38
+        defender_1 = env.agents["defender_1"]
+        defender_2 = env.agents["defender_2"]
+        assert (num_actions_1 := len(defender_1.action_manager.action_map)) == 74
+        assert (num_actions_2 := len(defender_2.action_manager.action_map)) == 74
 
         # ensure we can run all valid actions without error
         for act_1 in range(num_actions_1):
-            env.step({"defender1": act_1, "defender2": 0})
+            env.step({"defender_1": act_1, "defender_2": 0})
         for act_2 in range(num_actions_2):
-            env.step({"defender1": 0, "defender2": act_2})
+            env.step({"defender_1": 0, "defender_2": act_2})
 
         # ensure we get error when taking an invalid action
         with pytest.raises(KeyError):
-            env.step({"defender1": num_actions_1, "defender2": 0})
+            env.step({"defender_1": num_actions_1, "defender_2": 0})
         with pytest.raises(KeyError):
-            env.step({"defender1": 0, "defender2": num_actions_2})
+            env.step({"defender_1": 0, "defender_2": num_actions_2})
 
     def test_error_thrown_on_bad_configuration(self):
         """Make sure we throw an error when the config is bad."""