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
openai · Sep 28, 2021 · 947b857 · 947b857
1 parent ca42b05
commit 947b857
Show file tree

Hide file tree

Showing 56 changed files with 21 additions and 17 deletions.
diff --git a/scripts/generate_json.py b/scripts/generate_json.py
@@ -4,8 +4,8 @@
 import sys
 import argparse
 
-from gym.tests.envs.spec_list import should_skip_env_spec_for_tests
-from gym.tests import generate_rollout_hash
+from tests.envs.spec_list import should_skip_env_spec_for_tests
+from tests import generate_rollout_hash
 
 DATA_DIR = os.path.join(os.path.dirname(__file__), os.pardir, "gym", "envs", "tests")
 ROLLOUT_STEPS = 100

diff --git a/gym/tests/__init__.py → tests/__init__.py b/gym/tests/__init__.py → tests/__init__.py
diff --git a/gym/tests/envs/__init__.py → tests/envs/__init__.py b/gym/tests/envs/__init__.py → tests/envs/__init__.py
diff --git a/gym/tests/envs/robotics/__init__.py → tests/envs/robotics/__init__.py b/gym/tests/envs/robotics/__init__.py → tests/envs/robotics/__init__.py
diff --git a/gym/tests/envs/robotics/hand/__init__.py → tests/envs/robotics/hand/__init__.py b/gym/tests/envs/robotics/hand/__init__.py → tests/envs/robotics/hand/__init__.py
diff --git a/...sts/envs/robotics/hand/test_manipulate.py → tests/envs/robotics/hand/test_manipulate.py b/...sts/envs/robotics/hand/test_manipulate.py → tests/envs/robotics/hand/test_manipulate.py
@@ -3,7 +3,7 @@
 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 = (

diff --git a/...ics/hand/test_manipulate_touch_sensors.py → ...ics/hand/test_manipulate_touch_sensors.py b/...ics/hand/test_manipulate_touch_sensors.py → ...ics/hand/test_manipulate_touch_sensors.py
@@ -3,7 +3,7 @@
 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 = (

diff --git a/gym/tests/envs/robotics/hand/test_reach.py → tests/envs/robotics/hand/test_reach.py b/gym/tests/envs/robotics/hand/test_reach.py → tests/envs/robotics/hand/test_reach.py
@@ -3,7 +3,7 @@
 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)

diff --git a/gym/tests/envs/rollout.json → tests/envs/rollout.json b/gym/tests/envs/rollout.json → tests/envs/rollout.json
diff --git a/gym/tests/envs/spec_list.py → tests/envs/spec_list.py b/gym/tests/envs/spec_list.py → tests/envs/spec_list.py
diff --git a/...tests/envs/test_atari_legacy_env_specs.py → tests/envs/test_atari_legacy_env_specs.py b/...tests/envs/test_atari_legacy_env_specs.py → tests/envs/test_atari_legacy_env_specs.py
diff --git a/gym/tests/envs/test_determinism.py → tests/envs/test_determinism.py b/gym/tests/envs/test_determinism.py → 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)

diff --git a/gym/tests/envs/test_envs.py → tests/envs/test_envs.py b/gym/tests/envs/test_envs.py → tests/envs/test_envs.py
@@ -2,7 +2,7 @@
 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
 

diff --git a/gym/tests/envs/test_envs_semantics.py → tests/envs/test_envs_semantics.py b/gym/tests/envs/test_envs_semantics.py → tests/envs/test_envs_semantics.py
@@ -10,7 +10,7 @@
 
 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

diff --git a/gym/tests/envs/test_frozenlake_dfs.py → tests/envs/test_frozenlake_dfs.py b/gym/tests/envs/test_frozenlake_dfs.py → tests/envs/test_frozenlake_dfs.py
diff --git a/gym/envs/box2d/test_lunar_lander.py → tests/envs/test_lunar_lander.py b/gym/envs/box2d/test_lunar_lander.py → tests/envs/test_lunar_lander.py
@@ -2,7 +2,11 @@
 
 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
 

diff --git a/...s/envs/test_mujoco_v2_to_v3_conversion.py → ...s/envs/test_mujoco_v2_to_v3_conversion.py b/...s/envs/test_mujoco_v2_to_v3_conversion.py → ...s/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(

diff --git a/gym/tests/envs/test_registration.py → tests/envs/test_registration.py b/gym/tests/envs/test_registration.py → tests/envs/test_registration.py
@@ -14,7 +14,7 @@ def __init__(self, arg1, arg2, arg3):
 
 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",

diff --git a/gym/tests/spaces/__init__.py → tests/spaces/__init__.py b/gym/tests/spaces/__init__.py → tests/spaces/__init__.py
diff --git a/gym/tests/spaces/test_spaces.py → tests/spaces/test_spaces.py b/gym/tests/spaces/test_spaces.py → tests/spaces/test_spaces.py
diff --git a/gym/tests/spaces/test_utils.py → tests/spaces/test_utils.py b/gym/tests/spaces/test_utils.py → tests/spaces/test_utils.py
diff --git a/gym/tests/test_core.py → tests/test_core.py b/gym/tests/test_core.py → tests/test_core.py
diff --git a/gym/tests/utils/__init__.py → tests/utils/__init__.py b/gym/tests/utils/__init__.py → tests/utils/__init__.py
diff --git a/gym/tests/utils/test_atexit.py → tests/utils/test_atexit.py b/gym/tests/utils/test_atexit.py → tests/utils/test_atexit.py
diff --git a/gym/tests/utils/test_env_checker.py → tests/utils/test_env_checker.py b/gym/tests/utils/test_env_checker.py → tests/utils/test_env_checker.py
diff --git a/gym/tests/utils/test_seeding.py → tests/utils/test_seeding.py b/gym/tests/utils/test_seeding.py → tests/utils/test_seeding.py
diff --git a/gym/tests/vector/__init__.py → tests/vector/__init__.py b/gym/tests/vector/__init__.py → tests/vector/__init__.py
diff --git a/gym/tests/vector/test_async_vector_env.py → tests/vector/test_async_vector_env.py b/gym/tests/vector/test_async_vector_env.py → tests/vector/test_async_vector_env.py
@@ -4,7 +4,7 @@
 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,

diff --git a/gym/tests/vector/test_numpy_utils.py → tests/vector/test_numpy_utils.py b/gym/tests/vector/test_numpy_utils.py → tests/vector/test_numpy_utils.py
@@ -5,7 +5,7 @@
 
 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
 

diff --git a/gym/tests/vector/test_shared_memory.py → tests/vector/test_shared_memory.py b/gym/tests/vector/test_shared_memory.py → tests/vector/test_shared_memory.py
@@ -9,7 +9,7 @@
 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,

diff --git a/gym/tests/vector/test_spaces.py → tests/vector/test_spaces.py b/gym/tests/vector/test_spaces.py → tests/vector/test_spaces.py
@@ -2,7 +2,7 @@
 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
 

diff --git a/gym/tests/vector/test_sync_vector_env.py → tests/vector/test_sync_vector_env.py b/gym/tests/vector/test_sync_vector_env.py → tests/vector/test_sync_vector_env.py
@@ -2,7 +2,7 @@
 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
 

diff --git a/gym/tests/vector/test_vector_env.py → tests/vector/test_vector_env.py b/gym/tests/vector/test_vector_env.py → tests/vector/test_vector_env.py
@@ -2,7 +2,7 @@
 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

diff --git a/gym/tests/vector/test_vector_env_wrapper.py → tests/vector/test_vector_env_wrapper.py b/gym/tests/vector/test_vector_env_wrapper.py → tests/vector/test_vector_env_wrapper.py
diff --git a/gym/tests/vector/utils.py → tests/vector/utils.py b/gym/tests/vector/utils.py → tests/vector/utils.py
diff --git a/gym/tests/wrappers/__init__.py → tests/wrappers/__init__.py b/gym/tests/wrappers/__init__.py → tests/wrappers/__init__.py
diff --git a/gym/tests/wrappers/flatten_test.py → tests/wrappers/flatten_test.py b/gym/tests/wrappers/flatten_test.py → tests/wrappers/flatten_test.py
diff --git a/gym/tests/wrappers/monitoring/__init__.py → tests/wrappers/monitoring/__init__.py b/gym/tests/wrappers/monitoring/__init__.py → tests/wrappers/monitoring/__init__.py
diff --git a/gym/tests/wrappers/monitoring/helpers.py → tests/wrappers/monitoring/helpers.py b/gym/tests/wrappers/monitoring/helpers.py → tests/wrappers/monitoring/helpers.py
diff --git a/...rappers/monitoring/test_video_recorder.py → ...rappers/monitoring/test_video_recorder.py b/...rappers/monitoring/test_video_recorder.py → ...rappers/monitoring/test_video_recorder.py
diff --git a/gym/tests/wrappers/nested_dict_test.py → tests/wrappers/nested_dict_test.py b/gym/tests/wrappers/nested_dict_test.py → tests/wrappers/nested_dict_test.py
diff --git a/...ests/wrappers/test_atari_preprocessing.py → tests/wrappers/test_atari_preprocessing.py b/...ests/wrappers/test_atari_preprocessing.py → tests/wrappers/test_atari_preprocessing.py
diff --git a/gym/tests/wrappers/test_clip_action.py → tests/wrappers/test_clip_action.py b/gym/tests/wrappers/test_clip_action.py → tests/wrappers/test_clip_action.py
diff --git a/...tests/wrappers/test_filter_observation.py → tests/wrappers/test_filter_observation.py b/...tests/wrappers/test_filter_observation.py → tests/wrappers/test_filter_observation.py
diff --git a/...ests/wrappers/test_flatten_observation.py → tests/wrappers/test_flatten_observation.py b/...ests/wrappers/test_flatten_observation.py → tests/wrappers/test_flatten_observation.py
diff --git a/gym/tests/wrappers/test_frame_stack.py → tests/wrappers/test_frame_stack.py b/gym/tests/wrappers/test_frame_stack.py → tests/wrappers/test_frame_stack.py
diff --git a/...s/wrappers/test_gray_scale_observation.py → ...s/wrappers/test_gray_scale_observation.py b/...s/wrappers/test_gray_scale_observation.py → ...s/wrappers/test_gray_scale_observation.py
diff --git a/gym/tests/wrappers/test_normalize.py → tests/wrappers/test_normalize.py b/gym/tests/wrappers/test_normalize.py → tests/wrappers/test_normalize.py
diff --git a/gym/tests/wrappers/test_pixel_observation.py → tests/wrappers/test_pixel_observation.py b/gym/tests/wrappers/test_pixel_observation.py → tests/wrappers/test_pixel_observation.py
diff --git a/...rappers/test_record_episode_statistics.py → ...rappers/test_record_episode_statistics.py b/...rappers/test_record_episode_statistics.py → ...rappers/test_record_episode_statistics.py
diff --git a/gym/tests/wrappers/test_record_video.py → tests/wrappers/test_record_video.py b/gym/tests/wrappers/test_record_video.py → tests/wrappers/test_record_video.py
diff --git a/gym/tests/wrappers/test_rescale_action.py → tests/wrappers/test_rescale_action.py b/gym/tests/wrappers/test_rescale_action.py → tests/wrappers/test_rescale_action.py
diff --git a/...tests/wrappers/test_resize_observation.py → tests/wrappers/test_resize_observation.py b/...tests/wrappers/test_resize_observation.py → tests/wrappers/test_resize_observation.py
diff --git a/...s/wrappers/test_time_aware_observation.py → ...s/wrappers/test_time_aware_observation.py b/...s/wrappers/test_time_aware_observation.py → ...s/wrappers/test_time_aware_observation.py
diff --git a/...ts/wrappers/test_transform_observation.py → tests/wrappers/test_transform_observation.py b/...ts/wrappers/test_transform_observation.py → tests/wrappers/test_transform_observation.py
diff --git a/gym/tests/wrappers/test_transform_reward.py → tests/wrappers/test_transform_reward.py b/gym/tests/wrappers/test_transform_reward.py → tests/wrappers/test_transform_reward.py