Test refactoring (#2427)

* Move tests to root with automatic PyCharm import refactoring. This will likely fail some tests

* Changed entry point for a registration test env.

* Move a stray lunar_lander test to tests/envs/...

* black

* Change the version from which importlib_metadata is replaced with importlib.metadata. Also requiring installing importlib_metadata for python 3.8 now.

???????????

* Undo last commit

scripts/generate_json.py

@@ -4,8 +4,8 @@ import os
 import sys
 import argparse
 
-from gym.tests.envs.spec_list import should_skip_env_spec_for_tests
+from tests.envs.spec_list import should_skip_env_spec_for_tests
-from gym.tests import generate_rollout_hash
+from tests import generate_rollout_hash
 
 DATA_DIR = os.path.join(os.path.dirname(__file__), os.pardir, "gym", "envs", "tests")
 ROLLOUT_STEPS = 100

tests/envs/robotics/hand/test_manipulate.py

@@ -3,7 +3,7 @@ import pickle
 import pytest
 
 from gym import envs
-from gym.tests.envs.spec_list import skip_mujoco, SKIP_MUJOCO_WARNING_MESSAGE
+from tests.envs.spec_list import skip_mujoco, SKIP_MUJOCO_WARNING_MESSAGE
 
 
 ENVIRONMENT_IDS = (

tests/envs/robotics/hand/test_manipulate_touch_sensors.py

@@ -3,7 +3,7 @@ import pickle
 import pytest
 
 from gym import envs
-from gym.tests.envs.spec_list import skip_mujoco, SKIP_MUJOCO_WARNING_MESSAGE
+from tests.envs.spec_list import skip_mujoco, SKIP_MUJOCO_WARNING_MESSAGE
 
 
 ENVIRONMENT_IDS = (

tests/envs/robotics/hand/test_reach.py

@@ -3,7 +3,7 @@ import pickle
 import pytest
 
 from gym import envs
-from gym.tests.envs.spec_list import skip_mujoco, SKIP_MUJOCO_WARNING_MESSAGE
+from tests.envs.spec_list import skip_mujoco, SKIP_MUJOCO_WARNING_MESSAGE
 
 
 @pytest.mark.skipif(skip_mujoco, reason=SKIP_MUJOCO_WARNING_MESSAGE)

tests/envs/test_determinism.py

@@ -1,7 +1,7 @@
 import numpy as np
 import pytest
 
-from gym.tests.envs.spec_list import spec_list
+from tests.envs.spec_list import spec_list
 
 
 @pytest.mark.parametrize("spec", spec_list)

tests/envs/test_envs.py

@@ -2,7 +2,7 @@ import pytest
 import numpy as np
 
 from gym import envs
-from gym.tests.envs.spec_list import spec_list
+from tests.envs.spec_list import spec_list
 from gym.spaces import Box
 from gym.utils.env_checker import check_env
 

tests/envs/test_envs_semantics.py

@@ -10,7 +10,7 @@ import os
 
 import pytest
 from gym import spaces, logger
-from gym.tests.envs.spec_list import spec_list
+from tests.envs.spec_list import spec_list
 
 DATA_DIR = os.path.dirname(__file__)
 ROLLOUT_STEPS = 100

tests/envs/test_lunar_lander.py

@@ -2,7 +2,11 @@ import pytest
 
 try:
     import Box2D
-    from .lunar_lander import LunarLander, LunarLanderContinuous, demo_heuristic_lander
+    from gym.envs.box2d.lunar_lander import (
+        LunarLander,
+        LunarLanderContinuous,
+        demo_heuristic_lander,
+    )
 except ImportError:
     Box2D = None
 

tests/envs/test_mujoco_v2_to_v3_conversion.py

@@ -1,7 +1,7 @@
 import unittest
 import numpy as np
 from gym import envs
-from gym.tests.envs.spec_list import skip_mujoco, SKIP_MUJOCO_WARNING_MESSAGE
+from tests.envs.spec_list import skip_mujoco, SKIP_MUJOCO_WARNING_MESSAGE
 
 
 def verify_environments_match(

tests/envs/test_registration.py

@@ -14,7 +14,7 @@ class ArgumentEnv(gym.Env):
 
 gym.register(
     id="test.ArgumentEnv-v0",
-    entry_point="gym.tests.envs.test_registration:ArgumentEnv",
+    entry_point="tests.envs.test_registration:ArgumentEnv",
     kwargs={
         "arg1": "arg1",
         "arg2": "arg2",

tests/vector/test_async_vector_env.py

@@ -4,7 +4,7 @@ import numpy as np
 from multiprocessing import TimeoutError
 from gym.spaces import Box, Tuple
 from gym.error import AlreadyPendingCallError, NoAsyncCallError, ClosedEnvironmentError
-from gym.tests.vector.utils import (
+from tests.vector.utils import (
     CustomSpace,
     make_env,
     make_slow_env,

tests/vector/test_numpy_utils.py

@@ -5,7 +5,7 @@ from collections import OrderedDict
 
 from gym.spaces import Tuple, Dict
 from gym.vector.utils.spaces import _BaseGymSpaces
-from gym.tests.vector.utils import spaces
+from tests.vector.utils import spaces
 
 from gym.vector.utils.numpy_utils import concatenate, create_empty_array
 

tests/vector/test_shared_memory.py

@@ -9,7 +9,7 @@ from collections import OrderedDict
 from gym.spaces import Tuple, Dict
 from gym.error import CustomSpaceError
 from gym.vector.utils.spaces import _BaseGymSpaces
-from gym.tests.vector.utils import spaces, custom_spaces
+from tests.vector.utils import spaces, custom_spaces
 
 from gym.vector.utils.shared_memory import (
     create_shared_memory,

tests/vector/test_spaces.py

@@ -2,7 +2,7 @@ import pytest
 import numpy as np
 
 from gym.spaces import Box, MultiDiscrete, Tuple, Dict
-from gym.tests.vector.utils import spaces, custom_spaces, CustomSpace
+from tests.vector.utils import spaces, custom_spaces, CustomSpace
 
 from gym.vector.utils.spaces import batch_space
 

tests/vector/test_sync_vector_env.py

@@ -2,7 +2,7 @@ import pytest
 import numpy as np
 
 from gym.spaces import Box, Tuple
-from gym.tests.vector.utils import CustomSpace, make_env, make_custom_space_env
+from tests.vector.utils import CustomSpace, make_env, make_custom_space_env
 
 from gym.vector.sync_vector_env import SyncVectorEnv
 

tests/vector/test_vector_env.py

@@ -2,7 +2,7 @@ import pytest
 import numpy as np
 
 from gym.spaces import Tuple
-from gym.tests.vector.utils import CustomSpace, make_env
+from tests.vector.utils import CustomSpace, make_env
 
 from gym.vector.async_vector_env import AsyncVectorEnv
 from gym.vector.sync_vector_env import SyncVectorEnv