more

aimmo-game-creator/tests/test_game_manager.py

@@ -99,7 +99,7 @@ def test_added_games_given_correct_url(self):
     def test_token_generation(self):
         token = self.game_manager._generate_game_token()
         assert isinstance(token, str)
-        self.assertLessEqual(len(token), TOKEN_MAX_LENGTH)
+        assert len(token) <= TOKEN_MAX_LENGTH
 
     def test_adding_a_game_creates_game_allocation(self):
         game_manager = KubernetesGameManager("http://test/*")

aimmo-game-creator/tests/test_kube_components.py

@@ -17,8 +17,8 @@ def test_secret_is_loaded_and_data_is_added_correctly(self):
         """
         Ensures the secret object is created correctly with the correct data filled in.
         """
-        self.assertIsNotNone(self.secret.metadata)
-        self.assertIsNotNone(self.secret.string_data)
+        assert self.secret.metadata is not None
+        assert self.secret.string_data is not None
         assert self.secret.metadata.name == "game-1-token"
         assert self.secret.metadata.namespace == "default"
         assert self.secret.string_data["token"] == "TEST_TOKEN"

aimmo-game/tests/test_simulation/test_world_map.py

@@ -276,7 +276,7 @@ def test_attackable_avatar_returns_none(self):
         world_map = WorldMap(generate_grid(), self.settings)
         for x in (0, 1):
             for y in (0, 1):
-                self.assertIsNone(world_map.attackable_avatar(Location(x, y)))
+                assert world_map.attackable_avatar(Location(x, y)) is None
 
     def test_attackable_avatar_returns_avatar(self):
         avatar = DummyAvatar()