Move all tests to gym/tests/... (#2425)

* Moved all (?) tests to gym/tests * flake8 * Move all the tests into gym/gym/tests, this might fix all the import errors... hopefully * Move unittests back to envs * Fix unittest again * black * Fix to one test due to new paths
openai · Sep 28, 2021 · 3331efe · 3331efe
1 parent 52b7e5e
commit 3331efe
Show file tree

Hide file tree

Showing 56 changed files with 19 additions and 20 deletions.
diff --git a/gym/envs/tests/__init__.py → gym/tests/__init__.py b/gym/envs/tests/__init__.py → gym/tests/__init__.py
diff --git a/gym/spaces/tests/__init__.py → gym/tests/envs/__init__.py b/gym/spaces/tests/__init__.py → gym/tests/envs/__init__.py
diff --git a/gym/vector/tests/__init__.py → gym/tests/envs/robotics/__init__.py b/gym/vector/tests/__init__.py → gym/tests/envs/robotics/__init__.py
diff --git a/gym/wrappers/monitoring/tests/__init__.py → gym/tests/envs/robotics/hand/__init__.py b/gym/wrappers/monitoring/tests/__init__.py → gym/tests/envs/robotics/hand/__init__.py
diff --git a/...gym/envs/robotics/hand/test_manipulate.py → ...sts/envs/robotics/hand/test_manipulate.py b/...gym/envs/robotics/hand/test_manipulate.py → ...sts/envs/robotics/hand/test_manipulate.py
@@ -1,10 +1,9 @@
 import pickle
-import unittest
 
 import pytest
 
 from gym import envs
-from gym.envs.tests.spec_list import skip_mujoco, SKIP_MUJOCO_WARNING_MESSAGE
+from gym.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.envs.tests.spec_list import skip_mujoco, SKIP_MUJOCO_WARNING_MESSAGE
+from gym.tests.envs.spec_list import skip_mujoco, SKIP_MUJOCO_WARNING_MESSAGE
 
 
 ENVIRONMENT_IDS = (

diff --git a/tests/gym/envs/robotics/hand/test_reach.py → gym/tests/envs/robotics/hand/test_reach.py b/tests/gym/envs/robotics/hand/test_reach.py → gym/tests/envs/robotics/hand/test_reach.py
@@ -3,7 +3,7 @@
 import pytest
 
 from gym import envs
-from gym.envs.tests.spec_list import skip_mujoco, SKIP_MUJOCO_WARNING_MESSAGE
+from gym.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/envs/tests/rollout.json → gym/tests/envs/rollout.json b/gym/envs/tests/rollout.json → gym/tests/envs/rollout.json
diff --git a/gym/envs/tests/spec_list.py → gym/tests/envs/spec_list.py b/gym/envs/tests/spec_list.py → gym/tests/envs/spec_list.py
diff --git a/...envs/tests/test_atari_legacy_env_specs.py → ...tests/envs/test_atari_legacy_env_specs.py b/...envs/tests/test_atari_legacy_env_specs.py → ...tests/envs/test_atari_legacy_env_specs.py
diff --git a/gym/envs/tests/test_determinism.py → gym/tests/envs/test_determinism.py b/gym/envs/tests/test_determinism.py → gym/tests/envs/test_determinism.py
@@ -1,7 +1,7 @@
 import numpy as np
 import pytest
 
-from gym.envs.tests.spec_list import spec_list
+from gym.tests.envs.spec_list import spec_list
 
 
 @pytest.mark.parametrize("spec", spec_list)

diff --git a/gym/envs/tests/test_envs.py → gym/tests/envs/test_envs.py b/gym/envs/tests/test_envs.py → gym/tests/envs/test_envs.py
@@ -2,7 +2,7 @@
 import numpy as np
 
 from gym import envs
-from gym.envs.tests.spec_list import spec_list
+from gym.tests.envs.spec_list import spec_list
 from gym.spaces import Box
 from gym.utils.env_checker import check_env
 

diff --git a/gym/envs/tests/test_envs_semantics.py → gym/tests/envs/test_envs_semantics.py b/gym/envs/tests/test_envs_semantics.py → gym/tests/envs/test_envs_semantics.py
@@ -10,7 +10,7 @@
 
 import pytest
 from gym import spaces, logger
-from gym.envs.tests.spec_list import spec_list
+from gym.tests.envs.spec_list import spec_list
 
 DATA_DIR = os.path.dirname(__file__)
 ROLLOUT_STEPS = 100

diff --git a/gym/envs/tests/test_frozenlake_dfs.py → gym/tests/envs/test_frozenlake_dfs.py b/gym/envs/tests/test_frozenlake_dfs.py → gym/tests/envs/test_frozenlake_dfs.py
diff --git a/.../tests/test_mujoco_v2_to_v3_conversion.py → ...s/envs/test_mujoco_v2_to_v3_conversion.py b/.../tests/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.envs.tests.spec_list import skip_mujoco, SKIP_MUJOCO_WARNING_MESSAGE
+from gym.tests.envs.spec_list import skip_mujoco, SKIP_MUJOCO_WARNING_MESSAGE
 
 
 def verify_environments_match(

diff --git a/gym/envs/tests/test_registration.py → gym/tests/envs/test_registration.py b/gym/envs/tests/test_registration.py → gym/tests/envs/test_registration.py
@@ -14,7 +14,7 @@ def __init__(self, arg1, arg2, arg3):
 
 gym.register(
     id="test.ArgumentEnv-v0",
-    entry_point="gym.envs.tests.test_registration:ArgumentEnv",
+    entry_point="gym.tests.envs.test_registration:ArgumentEnv",
     kwargs={
         "arg1": "arg1",
         "arg2": "arg2",

diff --git a/gym/wrappers/tests/__init__.py → gym/tests/spaces/__init__.py b/gym/wrappers/tests/__init__.py → gym/tests/spaces/__init__.py
diff --git a/gym/spaces/tests/test_spaces.py → gym/tests/spaces/test_spaces.py b/gym/spaces/tests/test_spaces.py → gym/tests/spaces/test_spaces.py
diff --git a/gym/spaces/tests/test_utils.py → gym/tests/spaces/test_utils.py b/gym/spaces/tests/test_utils.py → gym/tests/spaces/test_utils.py
diff --git a/tests/__init__.py → gym/tests/utils/__init__.py b/tests/__init__.py → gym/tests/utils/__init__.py
diff --git a/gym/utils/tests/test_atexit.py → gym/tests/utils/test_atexit.py b/gym/utils/tests/test_atexit.py → gym/tests/utils/test_atexit.py
diff --git a/gym/utils/tests/test_env_checker.py → gym/tests/utils/test_env_checker.py b/gym/utils/tests/test_env_checker.py → gym/tests/utils/test_env_checker.py
diff --git a/gym/utils/tests/test_seeding.py → gym/tests/utils/test_seeding.py b/gym/utils/tests/test_seeding.py → gym/tests/utils/test_seeding.py
diff --git a/tests/gym/__init__.py → gym/tests/vector/__init__.py b/tests/gym/__init__.py → gym/tests/vector/__init__.py
diff --git a/gym/vector/tests/test_async_vector_env.py → gym/tests/vector/test_async_vector_env.py b/gym/vector/tests/test_async_vector_env.py → gym/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.vector.tests.utils import (
+from gym.tests.vector.utils import (
     CustomSpace,
     make_env,
     make_slow_env,

diff --git a/gym/vector/tests/test_numpy_utils.py → gym/tests/vector/test_numpy_utils.py b/gym/vector/tests/test_numpy_utils.py → gym/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.vector.tests.utils import spaces
+from gym.tests.vector.utils import spaces
 
 from gym.vector.utils.numpy_utils import concatenate, create_empty_array
 

diff --git a/gym/vector/tests/test_shared_memory.py → gym/tests/vector/test_shared_memory.py b/gym/vector/tests/test_shared_memory.py → gym/tests/vector/test_shared_memory.py
@@ -6,10 +6,10 @@
 from multiprocessing import Array, Process
 from collections import OrderedDict
 
-from gym.spaces import Box, Tuple, Dict
+from gym.spaces import Tuple, Dict
 from gym.error import CustomSpaceError
 from gym.vector.utils.spaces import _BaseGymSpaces
-from gym.vector.tests.utils import spaces, custom_spaces
+from gym.tests.vector.utils import spaces, custom_spaces
 
 from gym.vector.utils.shared_memory import (
     create_shared_memory,

diff --git a/gym/vector/tests/test_spaces.py → gym/tests/vector/test_spaces.py b/gym/vector/tests/test_spaces.py → gym/tests/vector/test_spaces.py
@@ -2,9 +2,9 @@
 import numpy as np
 
 from gym.spaces import Box, MultiDiscrete, Tuple, Dict
-from gym.vector.tests.utils import spaces, custom_spaces, CustomSpace
+from gym.tests.vector.utils import spaces, custom_spaces, CustomSpace
 
-from gym.vector.utils.spaces import _BaseGymSpaces, batch_space
+from gym.vector.utils.spaces import batch_space
 
 expected_batch_spaces_4 = [
     Box(low=-1.0, high=1.0, shape=(4,), dtype=np.float64),

diff --git a/gym/vector/tests/test_sync_vector_env.py → gym/tests/vector/test_sync_vector_env.py b/gym/vector/tests/test_sync_vector_env.py → gym/tests/vector/test_sync_vector_env.py
@@ -2,7 +2,7 @@
 import numpy as np
 
 from gym.spaces import Box, Tuple
-from gym.vector.tests.utils import CustomSpace, make_env, make_custom_space_env
+from gym.tests.vector.utils import CustomSpace, make_env, make_custom_space_env
 
 from gym.vector.sync_vector_env import SyncVectorEnv
 

diff --git a/gym/vector/tests/test_vector_env.py → gym/tests/vector/test_vector_env.py b/gym/vector/tests/test_vector_env.py → gym/tests/vector/test_vector_env.py
@@ -2,7 +2,7 @@
 import numpy as np
 
 from gym.spaces import Tuple
-from gym.vector.tests.utils import CustomSpace, make_env
+from gym.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/vector/tests/test_vector_env_wrapper.py → gym/tests/vector/test_vector_env_wrapper.py b/gym/vector/tests/test_vector_env_wrapper.py → gym/tests/vector/test_vector_env_wrapper.py
diff --git a/gym/vector/tests/utils.py → gym/tests/vector/utils.py b/gym/vector/tests/utils.py → gym/tests/vector/utils.py
diff --git a/tests/gym/envs/__init__.py → gym/tests/wrappers/__init__.py b/tests/gym/envs/__init__.py → gym/tests/wrappers/__init__.py
diff --git a/tests/gym/wrappers/flatten_test.py → gym/tests/wrappers/flatten_test.py b/tests/gym/wrappers/flatten_test.py → gym/tests/wrappers/flatten_test.py
diff --git a/tests/gym/envs/robotics/__init__.py → gym/tests/wrappers/monitoring/__init__.py b/tests/gym/envs/robotics/__init__.py → gym/tests/wrappers/monitoring/__init__.py
diff --git a/gym/wrappers/monitoring/tests/helpers.py → gym/tests/wrappers/monitoring/helpers.py b/gym/wrappers/monitoring/tests/helpers.py → gym/tests/wrappers/monitoring/helpers.py
diff --git a/...s/monitoring/tests/test_video_recorder.py → ...rappers/monitoring/test_video_recorder.py b/...s/monitoring/tests/test_video_recorder.py → ...rappers/monitoring/test_video_recorder.py
diff --git a/tests/gym/wrappers/nested_dict_test.py → gym/tests/wrappers/nested_dict_test.py b/tests/gym/wrappers/nested_dict_test.py → gym/tests/wrappers/nested_dict_test.py
diff --git a/gym/wrappers/test_atari_preprocessing.py → ...ests/wrappers/test_atari_preprocessing.py b/gym/wrappers/test_atari_preprocessing.py → ...ests/wrappers/test_atari_preprocessing.py
diff --git a/gym/wrappers/test_clip_action.py → gym/tests/wrappers/test_clip_action.py b/gym/wrappers/test_clip_action.py → gym/tests/wrappers/test_clip_action.py
diff --git a/gym/wrappers/test_filter_observation.py → ...tests/wrappers/test_filter_observation.py b/gym/wrappers/test_filter_observation.py → ...tests/wrappers/test_filter_observation.py
diff --git a/gym/wrappers/test_flatten_observation.py → ...ests/wrappers/test_flatten_observation.py b/gym/wrappers/test_flatten_observation.py → ...ests/wrappers/test_flatten_observation.py
diff --git a/gym/wrappers/test_frame_stack.py → gym/tests/wrappers/test_frame_stack.py b/gym/wrappers/test_frame_stack.py → gym/tests/wrappers/test_frame_stack.py
diff --git a/gym/wrappers/test_gray_scale_observation.py → ...s/wrappers/test_gray_scale_observation.py b/gym/wrappers/test_gray_scale_observation.py → ...s/wrappers/test_gray_scale_observation.py
diff --git a/gym/wrappers/test_normalize.py → gym/tests/wrappers/test_normalize.py b/gym/wrappers/test_normalize.py → gym/tests/wrappers/test_normalize.py
diff --git a/gym/wrappers/test_pixel_observation.py → gym/tests/wrappers/test_pixel_observation.py b/gym/wrappers/test_pixel_observation.py → gym/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/wrappers/test_record_video.py → gym/tests/wrappers/test_record_video.py b/gym/wrappers/test_record_video.py → gym/tests/wrappers/test_record_video.py
diff --git a/gym/wrappers/test_rescale_action.py → gym/tests/wrappers/test_rescale_action.py b/gym/wrappers/test_rescale_action.py → gym/tests/wrappers/test_rescale_action.py
diff --git a/gym/wrappers/test_resize_observation.py → ...tests/wrappers/test_resize_observation.py b/gym/wrappers/test_resize_observation.py → ...tests/wrappers/test_resize_observation.py
diff --git a/gym/wrappers/test_time_aware_observation.py → ...s/wrappers/test_time_aware_observation.py b/gym/wrappers/test_time_aware_observation.py → ...s/wrappers/test_time_aware_observation.py
diff --git a/gym/wrappers/test_transform_observation.py → ...ts/wrappers/test_transform_observation.py b/gym/wrappers/test_transform_observation.py → ...ts/wrappers/test_transform_observation.py
diff --git a/gym/wrappers/test_transform_reward.py → gym/tests/wrappers/test_transform_reward.py b/gym/wrappers/test_transform_reward.py → gym/tests/wrappers/test_transform_reward.py
diff --git a/scripts/generate_json.py b/scripts/generate_json.py
@@ -1,11 +1,11 @@
-from gym import envs, spaces, logger
+from gym import envs, logger
 import json
 import os
 import sys
 import argparse
 
-from gym.envs.tests.spec_list import should_skip_env_spec_for_tests
-from gym.envs.tests.test_envs_semantics import generate_rollout_hash, hash_object
+from gym.tests.envs.spec_list import should_skip_env_spec_for_tests
+from gym.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/tests/gym/envs/robotics/hand/__init__.py b/tests/gym/envs/robotics/hand/__init__.py
diff --git a/tests/gym/wrappers/__init__.py b/tests/gym/wrappers/__init__.py