Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Flatten tests/rest/client/{v1,v2_alpha} too #10667

Merged
merged 3 commits into from
Aug 20, 2021
Merged

Flatten tests/rest/client/{v1,v2_alpha} too #10667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2bdff1
Flatten tests/rest/client/{v1,v2_alpha} too
Aug 20, 2021
0ed1805
Changelog
Aug 20, 2021
3d380c0
Update mypy.ini with the rename
Aug 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/10667.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Flatten the `tests.synapse.rests` package by moving the contents of `v1` and `v2_alpha` into the parent.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could use the same changelog as #10600 if you wanted to combine them, but they're both misc so probably doesn't matter.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the mechanism there, sorry? Will towncrier spot that two changelogs have the same contents and report them only once?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the mechanism there, sorry? Will towncrier spot that two changelogs have the same contents and report them only once?

Yes, it will combine them onto a single line and link to all the PRs. Something like "My awesome change. (123, 456)"

4 changes: 2 additions & 2 deletions mypy.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
0 tests/rest/client/v2_alpha/test_account.py → tests/rest/client/test_account.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/rest/client/v2_alpha/test_auth.py → tests/rest/client/test_auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
0 ...rest/client/v2_alpha/test_capabilities.py → tests/rest/client/test_capabilities.py
View file
Open in desktop
File renamed without changes.
0 tests/rest/client/v1/test_directory.py → tests/rest/client/test_directory.py
View file
Open in desktop
File renamed without changes.
0 tests/rest/client/v1/test_events.py → tests/rest/client/test_events.py
View file
Open in desktop
File renamed without changes.
0 tests/rest/client/v2_alpha/test_filter.py → tests/rest/client/test_filter.py
View file
Open in desktop
File renamed without changes.
0 tests/rest/client/v2_alpha/test_keys.py → tests/rest/client/test_keys.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/rest/client/v1/test_login.py → tests/rest/client/test_login.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
0 ...t/client/v2_alpha/test_password_policy.py → tests/rest/client/test_password_policy.py
View file
Open in desktop
File renamed without changes.
0 tests/rest/client/v1/test_presence.py → tests/rest/client/test_presence.py
View file
Open in desktop
File renamed without changes.
0 tests/rest/client/v1/test_profile.py → tests/rest/client/test_profile.py
View file
Open in desktop
File renamed without changes.
0 tests/rest/client/v1/test_push_rule_attrs.py → tests/rest/client/test_push_rule_attrs.py
View file
Open in desktop
File renamed without changes.
0 tests/rest/client/v2_alpha/test_register.py → tests/rest/client/test_register.py
View file
Open in desktop
File renamed without changes.
0 tests/rest/client/v2_alpha/test_relations.py → tests/rest/client/test_relations.py
View file
Open in desktop
File renamed without changes.
0 ...rest/client/v2_alpha/test_report_event.py → tests/rest/client/test_report_event.py
View file
Open in desktop
File renamed without changes.
0 tests/rest/client/v1/test_rooms.py → tests/rest/client/test_rooms.py
View file
Open in desktop
File renamed without changes.
0 ...rest/client/v2_alpha/test_sendtodevice.py → tests/rest/client/test_sendtodevice.py
View file
Open in desktop
File renamed without changes.
0 ...rest/client/v2_alpha/test_shared_rooms.py → tests/rest/client/test_shared_rooms.py
View file
Open in desktop
File renamed without changes.
0 tests/rest/client/v2_alpha/test_sync.py → tests/rest/client/test_sync.py
View file
Open in desktop
File renamed without changes.
0 tests/rest/client/v1/test_typing.py → tests/rest/client/test_typing.py
View file
Open in desktop
File renamed without changes.
0 ...rest/client/v2_alpha/test_upgrade_room.py → tests/rest/client/test_upgrade_room.py
View file
Open in desktop
File renamed without changes.
0 tests/rest/client/v1/utils.py → tests/rest/client/utils.py
View file
Open in desktop
File renamed without changes.
13 changes: 0 additions & 13 deletions tests/rest/client/v1/__init__.py
View file
Open in desktop

This file was deleted.

Empty file removed tests/rest/client/v2_alpha/__init__.py
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion tests/unittest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down