Flatten tests/rest/client/{v1,v2_alpha} too (matrix-org#10667)

govynnus · Aug 20, 2021 · ecd823d · ecd823d
1 parent f499dc3
commit ecd823d
Show file tree

Hide file tree

Showing 27 changed files with 6 additions and 18 deletions.
diff --git a/changelog.d/10667.misc b/changelog.d/10667.misc
@@ -0,0 +1 @@
+Flatten the `tests.synapse.rests` package by moving the contents of `v1` and `v2_alpha` into the parent.
diff --git a/mypy.ini b/mypy.ini
@@ -91,8 +91,8 @@ files =
   tests/handlers/test_password_providers.py,
   tests/handlers/test_room_summary.py,
   tests/handlers/test_sync.py,
-  tests/rest/client/v1/test_login.py,
-  tests/rest/client/v2_alpha/test_auth.py,
+  tests/rest/client/test_login.py,
+  tests/rest/client/test_auth.py,
   tests/util/test_itertools.py,
   tests/util/test_stream_change_cache.py
 

diff --git a/tests/rest/client/v2_alpha/test_account.py → tests/rest/client/test_account.py b/tests/rest/client/v2_alpha/test_account.py → tests/rest/client/test_account.py
diff --git a/tests/rest/client/v2_alpha/test_auth.py → tests/rest/client/test_auth.py b/tests/rest/client/v2_alpha/test_auth.py → tests/rest/client/test_auth.py
@@ -25,7 +25,7 @@
 
 from tests import unittest
 from tests.handlers.test_oidc import HAS_OIDC
-from tests.rest.client.v1.utils import TEST_OIDC_CONFIG
+from tests.rest.client.utils import TEST_OIDC_CONFIG
 from tests.server import FakeChannel
 from tests.unittest import override_config, skip_unless
 

diff --git a/...rest/client/v2_alpha/test_capabilities.py → tests/rest/client/test_capabilities.py b/...rest/client/v2_alpha/test_capabilities.py → tests/rest/client/test_capabilities.py
diff --git a/tests/rest/client/v1/test_directory.py → tests/rest/client/test_directory.py b/tests/rest/client/v1/test_directory.py → tests/rest/client/test_directory.py
diff --git a/tests/rest/client/v1/test_events.py → tests/rest/client/test_events.py b/tests/rest/client/v1/test_events.py → tests/rest/client/test_events.py
diff --git a/tests/rest/client/v2_alpha/test_filter.py → tests/rest/client/test_filter.py b/tests/rest/client/v2_alpha/test_filter.py → tests/rest/client/test_filter.py
diff --git a/tests/rest/client/v2_alpha/test_keys.py → tests/rest/client/test_keys.py b/tests/rest/client/v2_alpha/test_keys.py → tests/rest/client/test_keys.py
diff --git a/tests/rest/client/v1/test_login.py → tests/rest/client/test_login.py b/tests/rest/client/v1/test_login.py → tests/rest/client/test_login.py
@@ -32,7 +32,7 @@
 from tests import unittest
 from tests.handlers.test_oidc import HAS_OIDC
 from tests.handlers.test_saml import has_saml2
-from tests.rest.client.v1.utils import TEST_OIDC_AUTH_ENDPOINT, TEST_OIDC_CONFIG
+from tests.rest.client.utils import TEST_OIDC_AUTH_ENDPOINT, TEST_OIDC_CONFIG
 from tests.test_utils.html_parsers import TestHtmlParser
 from tests.unittest import HomeserverTestCase, override_config, skip_unless
 

diff --git a/...t/client/v2_alpha/test_password_policy.py → tests/rest/client/test_password_policy.py b/...t/client/v2_alpha/test_password_policy.py → tests/rest/client/test_password_policy.py
diff --git a/tests/rest/client/v1/test_presence.py → tests/rest/client/test_presence.py b/tests/rest/client/v1/test_presence.py → tests/rest/client/test_presence.py
diff --git a/tests/rest/client/v1/test_profile.py → tests/rest/client/test_profile.py b/tests/rest/client/v1/test_profile.py → tests/rest/client/test_profile.py
diff --git a/tests/rest/client/v1/test_push_rule_attrs.py → tests/rest/client/test_push_rule_attrs.py b/tests/rest/client/v1/test_push_rule_attrs.py → tests/rest/client/test_push_rule_attrs.py
diff --git a/tests/rest/client/v2_alpha/test_register.py → tests/rest/client/test_register.py b/tests/rest/client/v2_alpha/test_register.py → tests/rest/client/test_register.py
diff --git a/tests/rest/client/v2_alpha/test_relations.py → tests/rest/client/test_relations.py b/tests/rest/client/v2_alpha/test_relations.py → tests/rest/client/test_relations.py
diff --git a/...rest/client/v2_alpha/test_report_event.py → tests/rest/client/test_report_event.py b/...rest/client/v2_alpha/test_report_event.py → tests/rest/client/test_report_event.py
diff --git a/tests/rest/client/v1/test_rooms.py → tests/rest/client/test_rooms.py b/tests/rest/client/v1/test_rooms.py → tests/rest/client/test_rooms.py
diff --git a/...rest/client/v2_alpha/test_sendtodevice.py → tests/rest/client/test_sendtodevice.py b/...rest/client/v2_alpha/test_sendtodevice.py → tests/rest/client/test_sendtodevice.py
diff --git a/...rest/client/v2_alpha/test_shared_rooms.py → tests/rest/client/test_shared_rooms.py b/...rest/client/v2_alpha/test_shared_rooms.py → tests/rest/client/test_shared_rooms.py
diff --git a/tests/rest/client/v2_alpha/test_sync.py → tests/rest/client/test_sync.py b/tests/rest/client/v2_alpha/test_sync.py → tests/rest/client/test_sync.py
diff --git a/tests/rest/client/v1/test_typing.py → tests/rest/client/test_typing.py b/tests/rest/client/v1/test_typing.py → tests/rest/client/test_typing.py
diff --git a/...rest/client/v2_alpha/test_upgrade_room.py → tests/rest/client/test_upgrade_room.py b/...rest/client/v2_alpha/test_upgrade_room.py → tests/rest/client/test_upgrade_room.py
diff --git a/tests/rest/client/v1/utils.py → tests/rest/client/utils.py b/tests/rest/client/v1/utils.py → tests/rest/client/utils.py
diff --git a/tests/rest/client/v1/__init__.py b/tests/rest/client/v1/__init__.py
diff --git a/tests/rest/client/v2_alpha/__init__.py b/tests/rest/client/v2_alpha/__init__.py
diff --git a/tests/unittest.py b/tests/unittest.py
@@ -252,7 +252,7 @@ def setUp(self):
             reactor=self.reactor,
         )
 
-        from tests.rest.client.v1.utils import RestHelper
+        from tests.rest.client.utils import RestHelper
 
         self.helper = RestHelper(self.hs, self.site, getattr(self, "user_id", None))