From e3bd22ed75ac26b6f39d83a286acb2715f9ea188 Mon Sep 17 00:00:00 2001 From: Stephen Cefali Date: Wed, 6 Nov 2019 08:40:30 -0800 Subject: [PATCH] moved the bulk of plugins from test_only_plugins into new_sentry_plugins --- conftest.py | 1 - setup.py | 36 +++++++++--------- .../asana/README.rst | 0 .../asana/__init__.py | 0 .../asana/client.py | 2 +- .../asana/plugin.py | 2 +- .../bitbucket/README.rst | 0 .../bitbucket/__init__.py | 2 +- .../bitbucket/client.py | 2 +- .../bitbucket/endpoints/__init__.py | 0 .../bitbucket/endpoints/webhook.py | 0 .../bitbucket/mixins.py | 2 +- .../bitbucket/plugin.py | 4 +- .../bitbucket/repository_provider.py | 2 +- .../bitbucket/testutils.py | 0 .../bitbucket/urls.py | 0 .../clubhouse/__init__.py | 0 .../clubhouse/client.py | 2 +- .../clubhouse/plugin.py | 4 +- .../github/README.rst | 0 src/new_sentry_plugins/github/__init__.py | 7 ++++ .../github/client.py | 2 +- .../github/endpoints/__init__.py | 0 .../github/endpoints/webhook.py | 4 +- .../github/options.py | 0 .../github/plugin.py | 8 ++-- .../github/testutils.py | 0 .../github/urls.py | 0 .../gitlab/README.rst | 0 .../gitlab/__init__.py | 2 +- .../gitlab/client.py | 4 +- .../gitlab/endpoints.py | 0 .../gitlab/plugin.py | 6 +-- .../heroku/__init__.py | 2 +- .../heroku/plugin.py | 2 +- .../jira/__init__.py | 2 +- .../jira/client.py | 4 +- .../jira/plugin.py | 8 ++-- .../static/jira/components/issueActions.jsx | 0 .../jira/static/jira/components/settings.jsx | 0 .../jira/static/jira/dist/jira.js | 0 .../jira/static/jira/dist/jira.js.gz | Bin .../jira/static/jira/dist/jira.js.map | 0 .../jira/static/jira/dist/jira.js.map.gz | Bin .../jira/static/jira/jira.jsx | 0 .../jira_ac/__init__.py | 0 .../jira_ac/forms.py | 0 .../jira_ac/migrations/0001_initial.py | 0 .../jira_ac/migrations/__init__.py | 0 .../jira_ac/models.py | 2 +- .../jira_ac/plugin.py | 4 +- .../jira_ac/templates/base.html | 0 .../jira_ac/templates/config.html | 0 .../jira_ac/templates/error.html | 0 .../jira_ac/templates/signin.html | 0 .../jira_ac/templates/widget.html | 0 .../jira_ac/urls.py | 2 +- .../jira_ac/utils.py | 4 +- .../jira_ac/views.py | 6 +-- .../phabricator/__init__.py | 0 .../phabricator/plugin.py | 4 +- .../pivotal/__init__.py | 2 +- .../pivotal/plugin.py | 4 +- .../pushover/__init__.py | 2 +- .../pushover/client.py | 2 +- .../pushover/plugin.py | 4 +- .../segment/__init__.py | 0 .../segment/plugin.py | 4 +- .../splunk/README.rst | 0 .../splunk/__init__.py | 0 .../splunk/plugin.py | 6 +-- .../victorops/__init__.py | 0 .../victorops/client.py | 2 +- .../victorops/plugin.py | 6 +-- .../vsts/.gitignore | 0 .../vsts/LICENSE | 0 .../vsts/README.rst | 0 .../vsts/__init__.py | 0 .../vsts/client.py | 2 +- .../vsts/mixins.py | 4 +- .../vsts/plugin.py | 0 .../vsts/repository_provider.py | 0 .../vsts/testutils.py | 0 src/sentry/testutils/cases.py | 13 ------- src/test_only_plugins/github/__init__.py | 7 ---- tests/sentry_plugins/asana/test_plugin.py | 4 +- .../bitbucket/endpoints/test_webhooks.py | 4 +- tests/sentry_plugins/bitbucket/test_plugin.py | 4 +- .../bitbucket/test_repository_provider.py | 4 +- tests/sentry_plugins/clubhouse/test_plugin.py | 4 +- .../github/endpoints/test_webhooks.py | 2 +- tests/sentry_plugins/github/test_plugin.py | 4 +- tests/sentry_plugins/github/test_provider.py | 6 +-- tests/sentry_plugins/gitlab/test_plugin.py | 4 +- tests/sentry_plugins/heroku/test_plugin.py | 2 +- tests/sentry_plugins/jira/test_plugin.py | 2 +- tests/sentry_plugins/jira_ac/test_plugin.py | 6 +-- .../sentry_plugins/phabricator/test_plugin.py | 4 +- .../pivotal/test_pivotal_plugin.py | 4 +- tests/sentry_plugins/pushover/test_plugin.py | 4 +- tests/sentry_plugins/segment/test_plugin.py | 4 +- tests/sentry_plugins/splunk/test_plugin.py | 4 +- tests/sentry_plugins/test_anonymizeip.py | 2 +- tests/sentry_plugins/test_client.py | 4 +- tests/sentry_plugins/victorops/test_plugin.py | 4 +- tests/sentry_plugins/vsts/test_plugin.py | 4 +- tests/sentry_plugins/vsts/test_provider.py | 4 +- 107 files changed, 129 insertions(+), 145 deletions(-) rename src/{test_only_plugins => new_sentry_plugins}/asana/README.rst (100%) rename src/{test_only_plugins => new_sentry_plugins}/asana/__init__.py (100%) rename src/{test_only_plugins => new_sentry_plugins}/asana/client.py (95%) rename src/{test_only_plugins => new_sentry_plugins}/asana/plugin.py (99%) rename src/{test_only_plugins => new_sentry_plugins}/bitbucket/README.rst (100%) rename src/{test_only_plugins => new_sentry_plugins}/bitbucket/__init__.py (58%) rename src/{test_only_plugins => new_sentry_plugins}/bitbucket/client.py (98%) rename src/{test_only_plugins => new_sentry_plugins}/bitbucket/endpoints/__init__.py (100%) rename src/{test_only_plugins => new_sentry_plugins}/bitbucket/endpoints/webhook.py (100%) rename src/{test_only_plugins => new_sentry_plugins}/bitbucket/mixins.py (90%) rename src/{test_only_plugins => new_sentry_plugins}/bitbucket/plugin.py (98%) rename src/{test_only_plugins => new_sentry_plugins}/bitbucket/repository_provider.py (98%) rename src/{test_only_plugins => new_sentry_plugins}/bitbucket/testutils.py (100%) rename src/{test_only_plugins => new_sentry_plugins}/bitbucket/urls.py (100%) rename src/{test_only_plugins => new_sentry_plugins}/clubhouse/__init__.py (100%) rename src/{test_only_plugins => new_sentry_plugins}/clubhouse/client.py (96%) rename src/{test_only_plugins => new_sentry_plugins}/clubhouse/plugin.py (98%) rename src/{test_only_plugins => new_sentry_plugins}/github/README.rst (100%) create mode 100644 src/new_sentry_plugins/github/__init__.py rename src/{test_only_plugins => new_sentry_plugins}/github/client.py (98%) rename src/{test_only_plugins => new_sentry_plugins}/github/endpoints/__init__.py (100%) rename src/{test_only_plugins => new_sentry_plugins}/github/endpoints/webhook.py (99%) rename src/{test_only_plugins => new_sentry_plugins}/github/options.py (100%) rename src/{test_only_plugins => new_sentry_plugins}/github/plugin.py (98%) rename src/{test_only_plugins => new_sentry_plugins}/github/testutils.py (100%) rename src/{test_only_plugins => new_sentry_plugins}/github/urls.py (100%) rename src/{test_only_plugins => new_sentry_plugins}/gitlab/README.rst (100%) rename src/{test_only_plugins => new_sentry_plugins}/gitlab/__init__.py (57%) rename src/{test_only_plugins => new_sentry_plugins}/gitlab/client.py (94%) rename src/{test_only_plugins => new_sentry_plugins}/gitlab/endpoints.py (100%) rename src/{test_only_plugins => new_sentry_plugins}/gitlab/plugin.py (97%) rename src/{test_only_plugins => new_sentry_plugins}/heroku/__init__.py (57%) rename src/{test_only_plugins => new_sentry_plugins}/heroku/plugin.py (98%) rename src/{test_only_plugins => new_sentry_plugins}/jira/__init__.py (56%) rename src/{test_only_plugins => new_sentry_plugins}/jira/client.py (97%) rename src/{test_only_plugins => new_sentry_plugins}/jira/plugin.py (99%) rename src/{test_only_plugins => new_sentry_plugins}/jira/static/jira/components/issueActions.jsx (100%) rename src/{test_only_plugins => new_sentry_plugins}/jira/static/jira/components/settings.jsx (100%) rename src/{test_only_plugins => new_sentry_plugins}/jira/static/jira/dist/jira.js (100%) rename src/{test_only_plugins => new_sentry_plugins}/jira/static/jira/dist/jira.js.gz (100%) rename src/{test_only_plugins => new_sentry_plugins}/jira/static/jira/dist/jira.js.map (100%) rename src/{test_only_plugins => new_sentry_plugins}/jira/static/jira/dist/jira.js.map.gz (100%) rename src/{test_only_plugins => new_sentry_plugins}/jira/static/jira/jira.jsx (100%) rename src/{test_only_plugins => new_sentry_plugins}/jira_ac/__init__.py (100%) rename src/{test_only_plugins => new_sentry_plugins}/jira_ac/forms.py (100%) rename src/{test_only_plugins => new_sentry_plugins}/jira_ac/migrations/0001_initial.py (100%) rename src/{test_only_plugins => new_sentry_plugins}/jira_ac/migrations/__init__.py (100%) rename src/{test_only_plugins => new_sentry_plugins}/jira_ac/models.py (94%) rename src/{test_only_plugins => new_sentry_plugins}/jira_ac/plugin.py (75%) rename src/{test_only_plugins => new_sentry_plugins}/jira_ac/templates/base.html (100%) rename src/{test_only_plugins => new_sentry_plugins}/jira_ac/templates/config.html (100%) rename src/{test_only_plugins => new_sentry_plugins}/jira_ac/templates/error.html (100%) rename src/{test_only_plugins => new_sentry_plugins}/jira_ac/templates/signin.html (100%) rename src/{test_only_plugins => new_sentry_plugins}/jira_ac/templates/widget.html (100%) rename src/{test_only_plugins => new_sentry_plugins}/jira_ac/urls.py (90%) rename src/{test_only_plugins => new_sentry_plugins}/jira_ac/utils.py (95%) rename src/{test_only_plugins => new_sentry_plugins}/jira_ac/views.py (97%) rename src/{test_only_plugins => new_sentry_plugins}/phabricator/__init__.py (100%) rename src/{test_only_plugins => new_sentry_plugins}/phabricator/plugin.py (98%) rename src/{test_only_plugins => new_sentry_plugins}/pivotal/__init__.py (57%) rename src/{test_only_plugins => new_sentry_plugins}/pivotal/plugin.py (98%) rename src/{test_only_plugins => new_sentry_plugins}/pushover/__init__.py (57%) rename src/{test_only_plugins => new_sentry_plugins}/pushover/client.py (94%) rename src/{test_only_plugins => new_sentry_plugins}/pushover/plugin.py (97%) rename src/{test_only_plugins => new_sentry_plugins}/segment/__init__.py (100%) rename src/{test_only_plugins => new_sentry_plugins}/segment/plugin.py (97%) rename src/{test_only_plugins => new_sentry_plugins}/splunk/README.rst (100%) rename src/{test_only_plugins => new_sentry_plugins}/splunk/__init__.py (100%) rename src/{test_only_plugins => new_sentry_plugins}/splunk/plugin.py (98%) rename src/{test_only_plugins => new_sentry_plugins}/victorops/__init__.py (100%) rename src/{test_only_plugins => new_sentry_plugins}/victorops/client.py (96%) rename src/{test_only_plugins => new_sentry_plugins}/victorops/plugin.py (94%) rename src/{test_only_plugins => new_sentry_plugins}/vsts/.gitignore (100%) rename src/{test_only_plugins => new_sentry_plugins}/vsts/LICENSE (100%) rename src/{test_only_plugins => new_sentry_plugins}/vsts/README.rst (100%) rename src/{test_only_plugins => new_sentry_plugins}/vsts/__init__.py (100%) rename src/{test_only_plugins => new_sentry_plugins}/vsts/client.py (98%) rename src/{test_only_plugins => new_sentry_plugins}/vsts/mixins.py (84%) rename src/{test_only_plugins => new_sentry_plugins}/vsts/plugin.py (100%) rename src/{test_only_plugins => new_sentry_plugins}/vsts/repository_provider.py (100%) rename src/{test_only_plugins => new_sentry_plugins}/vsts/testutils.py (100%) delete mode 100644 src/test_only_plugins/github/__init__.py diff --git a/conftest.py b/conftest.py index 16a30ed74b9509..696605e10f10e6 100644 --- a/conftest.py +++ b/conftest.py @@ -33,7 +33,6 @@ def install_sentry_plugins(): from django.conf import settings install_plugin_apps("sentry.new_apps", settings) - install_plugin_apps("sentry.test_only_apps", settings) from sentry.runner.initializer import register_plugins diff --git a/setup.py b/setup.py index 97d8673ab914e2..1905d3e69d422e 100755 --- a/setup.py +++ b/setup.py @@ -141,34 +141,32 @@ def run(self): entry_points={ "console_scripts": ["sentry = sentry.runner:main"], "sentry.new_apps": [ + "jira_ac = new_sentry_plugins.jira_ac", + "jira = new_sentry_plugins.jira", "sessionstack = new_sentry_plugins.sessionstack", ], - "sentry.test_only_apps": [ - "jira_ac = test_only_plugins.jira_ac", - "jira = test_only_plugins.jira", - ], "sentry.new_plugins": [ "amazon_sqs = new_sentry_plugins.amazon_sqs.plugin:AmazonSQSPlugin", + "asana = new_sentry_plugins.asana.plugin:AsanaPlugin", + "bitbucket = new_sentry_plugins.bitbucket.plugin:BitbucketPlugin", + "clubhouse = new_sentry_plugins.clubhouse.plugin:ClubhousePlugin", + "github = new_sentry_plugins.github.plugin:GitHubPlugin", + "gitlab = new_sentry_plugins.gitlab.plugin:GitLabPlugin", + "heroku = new_sentry_plugins.heroku.plugin:HerokuPlugin", + "jira = new_sentry_plugins.jira.plugin:JiraPlugin", + "jira_ac = new_sentry_plugins.jira_ac.plugin:JiraACPlugin", + "phabricator = new_sentry_plugins.phabricator.plugin:PhabricatorPlugin", + "pivotal = new_sentry_plugins.pivotal.plugin:PivotalPlugin", + "pushover = new_sentry_plugins.pushover.plugin:PushoverPlugin", + "segment = new_sentry_plugins.segment.plugin:SegmentPlugin", "sessionstack = new_sentry_plugins.sessionstack.plugin:SessionStackPlugin", + "splunk = new_sentry_plugins.splunk.plugin:SplunkPlugin", + "victorops = new_sentry_plugins.victorops.plugin:VictorOpsPlugin", + "vsts = new_sentry_plugins.vsts.plugin:VstsPlugin", ], "sentry.test_only_plugins": [ - "asana = test_only_plugins.asana.plugin:AsanaPlugin", - "bitbucket = test_only_plugins.bitbucket.plugin:BitbucketPlugin", - "clubhouse = test_only_plugins.clubhouse.plugin:ClubhousePlugin", - "github = test_only_plugins.github.plugin:GitHubPlugin", - "gitlab = test_only_plugins.gitlab.plugin:GitLabPlugin", - "heroku = test_only_plugins.heroku.plugin:HerokuPlugin", - "jira = test_only_plugins.jira.plugin:JiraPlugin", - "jira_ac = test_only_plugins.jira_ac.plugin:JiraACPlugin", "pagerduty = test_only_plugins.pagerduty.plugin:PagerDutyPlugin", - "phabricator = test_only_plugins.phabricator.plugin:PhabricatorPlugin", - "pivotal = test_only_plugins.pivotal.plugin:PivotalPlugin", - "pushover = test_only_plugins.pushover.plugin:PushoverPlugin", - "segment = test_only_plugins.segment.plugin:SegmentPlugin", "slack = test_only_plugins.slack.plugin:SlackPlugin", - "splunk = test_only_plugins.splunk.plugin:SplunkPlugin", - "victorops = test_only_plugins.victorops.plugin:VictorOpsPlugin", - "vsts = test_only_plugins.vsts.plugin:VstsPlugin", ], }, classifiers=[ diff --git a/src/test_only_plugins/asana/README.rst b/src/new_sentry_plugins/asana/README.rst similarity index 100% rename from src/test_only_plugins/asana/README.rst rename to src/new_sentry_plugins/asana/README.rst diff --git a/src/test_only_plugins/asana/__init__.py b/src/new_sentry_plugins/asana/__init__.py similarity index 100% rename from src/test_only_plugins/asana/__init__.py rename to src/new_sentry_plugins/asana/__init__.py diff --git a/src/test_only_plugins/asana/client.py b/src/new_sentry_plugins/asana/client.py similarity index 95% rename from src/test_only_plugins/asana/client.py rename to src/new_sentry_plugins/asana/client.py index dd0763683679e0..231f77d834d3df 100644 --- a/src/test_only_plugins/asana/client.py +++ b/src/new_sentry_plugins/asana/client.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -from test_only_plugins.client import AuthApiClient +from new_sentry_plugins.client import AuthApiClient from six import text_type diff --git a/src/test_only_plugins/asana/plugin.py b/src/new_sentry_plugins/asana/plugin.py similarity index 99% rename from src/test_only_plugins/asana/plugin.py rename to src/new_sentry_plugins/asana/plugin.py index da385da51dfe2f..472a4bfbd88174 100644 --- a/src/test_only_plugins/asana/plugin.py +++ b/src/new_sentry_plugins/asana/plugin.py @@ -8,7 +8,7 @@ from sentry.plugins.bases.issue2 import IssuePlugin2, IssueGroupActionEndpoint from sentry.utils.http import absolute_uri -from test_only_plugins.base import CorePluginMixin +from new_sentry_plugins.base import CorePluginMixin from .client import AsanaClient diff --git a/src/test_only_plugins/bitbucket/README.rst b/src/new_sentry_plugins/bitbucket/README.rst similarity index 100% rename from src/test_only_plugins/bitbucket/README.rst rename to src/new_sentry_plugins/bitbucket/README.rst diff --git a/src/test_only_plugins/bitbucket/__init__.py b/src/new_sentry_plugins/bitbucket/__init__.py similarity index 58% rename from src/test_only_plugins/bitbucket/__init__.py rename to src/new_sentry_plugins/bitbucket/__init__.py index 767201f1952232..12350e2bd6191c 100644 --- a/src/test_only_plugins/bitbucket/__init__.py +++ b/src/new_sentry_plugins/bitbucket/__init__.py @@ -1,5 +1,5 @@ from __future__ import absolute_import -from test_only_plugins.base import assert_package_not_installed +from new_sentry_plugins.base import assert_package_not_installed assert_package_not_installed("sentry-bitbucket") diff --git a/src/test_only_plugins/bitbucket/client.py b/src/new_sentry_plugins/bitbucket/client.py similarity index 98% rename from src/test_only_plugins/bitbucket/client.py rename to src/new_sentry_plugins/bitbucket/client.py index 3fa7c211de59ad..4befa9e3dd4862 100644 --- a/src/test_only_plugins/bitbucket/client.py +++ b/src/new_sentry_plugins/bitbucket/client.py @@ -6,7 +6,7 @@ from requests_oauthlib import OAuth1 from unidiff import PatchSet -from test_only_plugins.client import AuthApiClient +from new_sentry_plugins.client import AuthApiClient class BitbucketClient(AuthApiClient): diff --git a/src/test_only_plugins/bitbucket/endpoints/__init__.py b/src/new_sentry_plugins/bitbucket/endpoints/__init__.py similarity index 100% rename from src/test_only_plugins/bitbucket/endpoints/__init__.py rename to src/new_sentry_plugins/bitbucket/endpoints/__init__.py diff --git a/src/test_only_plugins/bitbucket/endpoints/webhook.py b/src/new_sentry_plugins/bitbucket/endpoints/webhook.py similarity index 100% rename from src/test_only_plugins/bitbucket/endpoints/webhook.py rename to src/new_sentry_plugins/bitbucket/endpoints/webhook.py diff --git a/src/test_only_plugins/bitbucket/mixins.py b/src/new_sentry_plugins/bitbucket/mixins.py similarity index 90% rename from src/test_only_plugins/bitbucket/mixins.py rename to src/new_sentry_plugins/bitbucket/mixins.py index 1a2e1af087fbb6..3a194be704a88f 100644 --- a/src/test_only_plugins/bitbucket/mixins.py +++ b/src/new_sentry_plugins/bitbucket/mixins.py @@ -4,7 +4,7 @@ from sentry.exceptions import PluginError -from test_only_plugins.base import CorePluginMixin +from new_sentry_plugins.base import CorePluginMixin from .client import BitbucketClient diff --git a/src/test_only_plugins/bitbucket/plugin.py b/src/new_sentry_plugins/bitbucket/plugin.py similarity index 98% rename from src/test_only_plugins/bitbucket/plugin.py rename to src/new_sentry_plugins/bitbucket/plugin.py index 9116643661694b..d7c75319a32061 100644 --- a/src/test_only_plugins/bitbucket/plugin.py +++ b/src/new_sentry_plugins/bitbucket/plugin.py @@ -5,7 +5,7 @@ from sentry.plugins.bases.issue2 import IssuePlugin2, IssueGroupActionEndpoint from sentry.utils.http import absolute_uri -from test_only_plugins.exceptions import ApiError +from new_sentry_plugins.exceptions import ApiError from .mixins import BitbucketMixin from .repository_provider import BitbucketRepositoryProvider @@ -49,7 +49,7 @@ def get_group_urls(self): ] def get_url_module(self): - return "test_only_plugins.bitbucket.urls" + return "new_sentry_plugins.bitbucket.urls" def is_configured(self, request, project, **kwargs): return bool(self.get_option("repo", project)) diff --git a/src/test_only_plugins/bitbucket/repository_provider.py b/src/new_sentry_plugins/bitbucket/repository_provider.py similarity index 98% rename from src/test_only_plugins/bitbucket/repository_provider.py rename to src/new_sentry_plugins/bitbucket/repository_provider.py index 1afb101f6bd870..a6bbe3afa541b3 100644 --- a/src/test_only_plugins/bitbucket/repository_provider.py +++ b/src/new_sentry_plugins/bitbucket/repository_provider.py @@ -9,7 +9,7 @@ from sentry.plugins import providers from sentry.utils.http import absolute_uri -from test_only_plugins.exceptions import ApiError +from new_sentry_plugins.exceptions import ApiError from .endpoints.webhook import parse_raw_user_email, parse_raw_user_name from .mixins import BitbucketMixin diff --git a/src/test_only_plugins/bitbucket/testutils.py b/src/new_sentry_plugins/bitbucket/testutils.py similarity index 100% rename from src/test_only_plugins/bitbucket/testutils.py rename to src/new_sentry_plugins/bitbucket/testutils.py diff --git a/src/test_only_plugins/bitbucket/urls.py b/src/new_sentry_plugins/bitbucket/urls.py similarity index 100% rename from src/test_only_plugins/bitbucket/urls.py rename to src/new_sentry_plugins/bitbucket/urls.py diff --git a/src/test_only_plugins/clubhouse/__init__.py b/src/new_sentry_plugins/clubhouse/__init__.py similarity index 100% rename from src/test_only_plugins/clubhouse/__init__.py rename to src/new_sentry_plugins/clubhouse/__init__.py diff --git a/src/test_only_plugins/clubhouse/client.py b/src/new_sentry_plugins/clubhouse/client.py similarity index 96% rename from src/test_only_plugins/clubhouse/client.py rename to src/new_sentry_plugins/clubhouse/client.py index 7564f6825e8e0f..9137c6be1f167e 100644 --- a/src/test_only_plugins/clubhouse/client.py +++ b/src/new_sentry_plugins/clubhouse/client.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -from test_only_plugins.client import ApiClient +from new_sentry_plugins.client import ApiClient class ClubhouseClient(ApiClient): diff --git a/src/test_only_plugins/clubhouse/plugin.py b/src/new_sentry_plugins/clubhouse/plugin.py similarity index 98% rename from src/test_only_plugins/clubhouse/plugin.py rename to src/new_sentry_plugins/clubhouse/plugin.py index d04c47a41b321b..054c8d49ff6212 100644 --- a/src/test_only_plugins/clubhouse/plugin.py +++ b/src/new_sentry_plugins/clubhouse/plugin.py @@ -8,8 +8,8 @@ from sentry.plugins.bases.issue2 import IssuePlugin2, IssueGroupActionEndpoint from sentry.utils.http import absolute_uri -from test_only_plugins.base import CorePluginMixin -from test_only_plugins.utils import get_secret_field_config +from new_sentry_plugins.base import CorePluginMixin +from new_sentry_plugins.utils import get_secret_field_config from .client import ClubhouseClient diff --git a/src/test_only_plugins/github/README.rst b/src/new_sentry_plugins/github/README.rst similarity index 100% rename from src/test_only_plugins/github/README.rst rename to src/new_sentry_plugins/github/README.rst diff --git a/src/new_sentry_plugins/github/__init__.py b/src/new_sentry_plugins/github/__init__.py new file mode 100644 index 00000000000000..6c2cba01b4e45f --- /dev/null +++ b/src/new_sentry_plugins/github/__init__.py @@ -0,0 +1,7 @@ +from __future__ import absolute_import + +from new_sentry_plugins.base import assert_package_not_installed + +assert_package_not_installed("sentry-github") + +from new_sentry_plugins.github import options # NOQA diff --git a/src/test_only_plugins/github/client.py b/src/new_sentry_plugins/github/client.py similarity index 98% rename from src/test_only_plugins/github/client.py rename to src/new_sentry_plugins/github/client.py index 578996dfdb97dc..d81b0424626016 100644 --- a/src/test_only_plugins/github/client.py +++ b/src/new_sentry_plugins/github/client.py @@ -8,7 +8,7 @@ from django.conf import settings from sentry import options -from test_only_plugins.client import ApiClient, AuthApiClient +from new_sentry_plugins.client import ApiClient, AuthApiClient class GitHubClientMixin(AuthApiClient): diff --git a/src/test_only_plugins/github/endpoints/__init__.py b/src/new_sentry_plugins/github/endpoints/__init__.py similarity index 100% rename from src/test_only_plugins/github/endpoints/__init__.py rename to src/new_sentry_plugins/github/endpoints/__init__.py diff --git a/src/test_only_plugins/github/endpoints/webhook.py b/src/new_sentry_plugins/github/endpoints/webhook.py similarity index 99% rename from src/test_only_plugins/github/endpoints/webhook.py rename to src/new_sentry_plugins/github/endpoints/webhook.py index 3f6bc8d9102e43..01ade861de6dd4 100644 --- a/src/test_only_plugins/github/endpoints/webhook.py +++ b/src/new_sentry_plugins/github/endpoints/webhook.py @@ -30,8 +30,8 @@ from sentry.plugins.providers import RepositoryProvider from sentry.utils import json -from test_only_plugins.exceptions import ApiError -from test_only_plugins.github.client import GitHubClient +from new_sentry_plugins.exceptions import ApiError +from new_sentry_plugins.github.client import GitHubClient logger = logging.getLogger("sentry.webhooks") diff --git a/src/test_only_plugins/github/options.py b/src/new_sentry_plugins/github/options.py similarity index 100% rename from src/test_only_plugins/github/options.py rename to src/new_sentry_plugins/github/options.py diff --git a/src/test_only_plugins/github/plugin.py b/src/new_sentry_plugins/github/plugin.py similarity index 98% rename from src/test_only_plugins/github/plugin.py rename to src/new_sentry_plugins/github/plugin.py index 2a61076f6f5ba8..5764cb1cf254af 100644 --- a/src/test_only_plugins/github/plugin.py +++ b/src/new_sentry_plugins/github/plugin.py @@ -16,9 +16,9 @@ from sentry.plugins import providers from sentry.utils.http import absolute_uri -from test_only_plugins.base import CorePluginMixin -from test_only_plugins.constants import ERR_UNAUTHORIZED, ERR_INTERNAL -from test_only_plugins.exceptions import ApiError +from new_sentry_plugins.base import CorePluginMixin +from new_sentry_plugins.constants import ERR_UNAUTHORIZED, ERR_INTERNAL +from new_sentry_plugins.exceptions import ApiError from .client import GitHubClient, GitHubAppsClient @@ -77,7 +77,7 @@ def get_group_urls(self): ] def get_url_module(self): - return "test_only_plugins.github.urls" + return "new_sentry_plugins.github.urls" def is_configured(self, request, project, **kwargs): return bool(self.get_option("repo", project)) diff --git a/src/test_only_plugins/github/testutils.py b/src/new_sentry_plugins/github/testutils.py similarity index 100% rename from src/test_only_plugins/github/testutils.py rename to src/new_sentry_plugins/github/testutils.py diff --git a/src/test_only_plugins/github/urls.py b/src/new_sentry_plugins/github/urls.py similarity index 100% rename from src/test_only_plugins/github/urls.py rename to src/new_sentry_plugins/github/urls.py diff --git a/src/test_only_plugins/gitlab/README.rst b/src/new_sentry_plugins/gitlab/README.rst similarity index 100% rename from src/test_only_plugins/gitlab/README.rst rename to src/new_sentry_plugins/gitlab/README.rst diff --git a/src/test_only_plugins/gitlab/__init__.py b/src/new_sentry_plugins/gitlab/__init__.py similarity index 57% rename from src/test_only_plugins/gitlab/__init__.py rename to src/new_sentry_plugins/gitlab/__init__.py index 01718f64d7890a..250c582cc44598 100644 --- a/src/test_only_plugins/gitlab/__init__.py +++ b/src/new_sentry_plugins/gitlab/__init__.py @@ -1,5 +1,5 @@ from __future__ import absolute_import -from test_only_plugins.base import assert_package_not_installed +from new_sentry_plugins.base import assert_package_not_installed assert_package_not_installed("sentry-gitlab") diff --git a/src/test_only_plugins/gitlab/client.py b/src/new_sentry_plugins/gitlab/client.py similarity index 94% rename from src/test_only_plugins/gitlab/client.py rename to src/new_sentry_plugins/gitlab/client.py index 3ed0b99f4437d9..3565a41e9fb581 100644 --- a/src/test_only_plugins/gitlab/client.py +++ b/src/new_sentry_plugins/gitlab/client.py @@ -1,9 +1,9 @@ from __future__ import absolute_import from six.moves.urllib.parse import quote -from test_only_plugins.client import ApiClient +from new_sentry_plugins.client import ApiClient -from test_only_plugins.exceptions import ApiError +from new_sentry_plugins.exceptions import ApiError class GitLabClient(ApiClient): diff --git a/src/test_only_plugins/gitlab/endpoints.py b/src/new_sentry_plugins/gitlab/endpoints.py similarity index 100% rename from src/test_only_plugins/gitlab/endpoints.py rename to src/new_sentry_plugins/gitlab/endpoints.py diff --git a/src/test_only_plugins/gitlab/plugin.py b/src/new_sentry_plugins/gitlab/plugin.py similarity index 97% rename from src/test_only_plugins/gitlab/plugin.py rename to src/new_sentry_plugins/gitlab/plugin.py index b611201095eadc..8a32ac9a65821b 100644 --- a/src/test_only_plugins/gitlab/plugin.py +++ b/src/new_sentry_plugins/gitlab/plugin.py @@ -3,9 +3,9 @@ from sentry.plugins.bases.issue2 import IssuePlugin2 from sentry.utils.http import absolute_uri -from test_only_plugins.base import CorePluginMixin -from test_only_plugins.exceptions import ApiError -from test_only_plugins.utils import get_secret_field_config +from new_sentry_plugins.base import CorePluginMixin +from new_sentry_plugins.exceptions import ApiError +from new_sentry_plugins.utils import get_secret_field_config from .client import GitLabClient diff --git a/src/test_only_plugins/heroku/__init__.py b/src/new_sentry_plugins/heroku/__init__.py similarity index 57% rename from src/test_only_plugins/heroku/__init__.py rename to src/new_sentry_plugins/heroku/__init__.py index 74ff594067bdd8..eac7bc3a61cba5 100644 --- a/src/test_only_plugins/heroku/__init__.py +++ b/src/new_sentry_plugins/heroku/__init__.py @@ -1,5 +1,5 @@ from __future__ import absolute_import -from test_only_plugins.base import assert_package_not_installed +from new_sentry_plugins.base import assert_package_not_installed assert_package_not_installed("sentry-heroku") diff --git a/src/test_only_plugins/heroku/plugin.py b/src/new_sentry_plugins/heroku/plugin.py similarity index 98% rename from src/test_only_plugins/heroku/plugin.py rename to src/new_sentry_plugins/heroku/plugin.py index 9e38413b8853e0..089761ec9267de 100644 --- a/src/test_only_plugins/heroku/plugin.py +++ b/src/new_sentry_plugins/heroku/plugin.py @@ -6,7 +6,7 @@ from sentry.models import ApiKey, User, ProjectOption, Repository from sentry.plugins.interfaces.releasehook import ReleaseHook -from test_only_plugins.base import CorePluginMixin +from new_sentry_plugins.base import CorePluginMixin from sentry.plugins.base.configuration import react_plugin_config from sentry.plugins.bases import ReleaseTrackingPlugin diff --git a/src/test_only_plugins/jira/__init__.py b/src/new_sentry_plugins/jira/__init__.py similarity index 56% rename from src/test_only_plugins/jira/__init__.py rename to src/new_sentry_plugins/jira/__init__.py index 4bbae983cd3e3a..55004ee42967b1 100644 --- a/src/test_only_plugins/jira/__init__.py +++ b/src/new_sentry_plugins/jira/__init__.py @@ -1,5 +1,5 @@ from __future__ import absolute_import -from test_only_plugins.base import assert_package_not_installed +from new_sentry_plugins.base import assert_package_not_installed assert_package_not_installed("sentry-jira") diff --git a/src/test_only_plugins/jira/client.py b/src/new_sentry_plugins/jira/client.py similarity index 97% rename from src/test_only_plugins/jira/client.py rename to src/new_sentry_plugins/jira/client.py index ccc6244581b515..b52886092177aa 100644 --- a/src/test_only_plugins/jira/client.py +++ b/src/new_sentry_plugins/jira/client.py @@ -7,8 +7,8 @@ from sentry.utils.cache import cache from django.utils.encoding import force_bytes -from test_only_plugins.exceptions import ApiError -from test_only_plugins.client import ApiClient +from new_sentry_plugins.exceptions import ApiError +from new_sentry_plugins.client import ApiClient log = logging.getLogger(__name__) diff --git a/src/test_only_plugins/jira/plugin.py b/src/new_sentry_plugins/jira/plugin.py similarity index 99% rename from src/test_only_plugins/jira/plugin.py rename to src/new_sentry_plugins/jira/plugin.py index 63e8cb992a46e8..ee247c909f839a 100644 --- a/src/test_only_plugins/jira/plugin.py +++ b/src/new_sentry_plugins/jira/plugin.py @@ -19,10 +19,10 @@ from sentry.plugins.bases.issue2 import IssuePlugin2, IssueGroupActionEndpoint, PluginError from sentry.utils.http import absolute_uri -from test_only_plugins.base import CorePluginMixin -from test_only_plugins.exceptions import ApiError, ApiUnauthorized -from test_only_plugins.jira.client import JiraClient -from test_only_plugins.utils import get_secret_field_config +from new_sentry_plugins.base import CorePluginMixin +from new_sentry_plugins.exceptions import ApiError, ApiUnauthorized +from new_sentry_plugins.jira.client import JiraClient +from new_sentry_plugins.utils import get_secret_field_config # A list of common builtin custom field types for JIRA for easy reference. JIRA_CUSTOM_FIELD_TYPES = { diff --git a/src/test_only_plugins/jira/static/jira/components/issueActions.jsx b/src/new_sentry_plugins/jira/static/jira/components/issueActions.jsx similarity index 100% rename from src/test_only_plugins/jira/static/jira/components/issueActions.jsx rename to src/new_sentry_plugins/jira/static/jira/components/issueActions.jsx diff --git a/src/test_only_plugins/jira/static/jira/components/settings.jsx b/src/new_sentry_plugins/jira/static/jira/components/settings.jsx similarity index 100% rename from src/test_only_plugins/jira/static/jira/components/settings.jsx rename to src/new_sentry_plugins/jira/static/jira/components/settings.jsx diff --git a/src/test_only_plugins/jira/static/jira/dist/jira.js b/src/new_sentry_plugins/jira/static/jira/dist/jira.js similarity index 100% rename from src/test_only_plugins/jira/static/jira/dist/jira.js rename to src/new_sentry_plugins/jira/static/jira/dist/jira.js diff --git a/src/test_only_plugins/jira/static/jira/dist/jira.js.gz b/src/new_sentry_plugins/jira/static/jira/dist/jira.js.gz similarity index 100% rename from src/test_only_plugins/jira/static/jira/dist/jira.js.gz rename to src/new_sentry_plugins/jira/static/jira/dist/jira.js.gz diff --git a/src/test_only_plugins/jira/static/jira/dist/jira.js.map b/src/new_sentry_plugins/jira/static/jira/dist/jira.js.map similarity index 100% rename from src/test_only_plugins/jira/static/jira/dist/jira.js.map rename to src/new_sentry_plugins/jira/static/jira/dist/jira.js.map diff --git a/src/test_only_plugins/jira/static/jira/dist/jira.js.map.gz b/src/new_sentry_plugins/jira/static/jira/dist/jira.js.map.gz similarity index 100% rename from src/test_only_plugins/jira/static/jira/dist/jira.js.map.gz rename to src/new_sentry_plugins/jira/static/jira/dist/jira.js.map.gz diff --git a/src/test_only_plugins/jira/static/jira/jira.jsx b/src/new_sentry_plugins/jira/static/jira/jira.jsx similarity index 100% rename from src/test_only_plugins/jira/static/jira/jira.jsx rename to src/new_sentry_plugins/jira/static/jira/jira.jsx diff --git a/src/test_only_plugins/jira_ac/__init__.py b/src/new_sentry_plugins/jira_ac/__init__.py similarity index 100% rename from src/test_only_plugins/jira_ac/__init__.py rename to src/new_sentry_plugins/jira_ac/__init__.py diff --git a/src/test_only_plugins/jira_ac/forms.py b/src/new_sentry_plugins/jira_ac/forms.py similarity index 100% rename from src/test_only_plugins/jira_ac/forms.py rename to src/new_sentry_plugins/jira_ac/forms.py diff --git a/src/test_only_plugins/jira_ac/migrations/0001_initial.py b/src/new_sentry_plugins/jira_ac/migrations/0001_initial.py similarity index 100% rename from src/test_only_plugins/jira_ac/migrations/0001_initial.py rename to src/new_sentry_plugins/jira_ac/migrations/0001_initial.py diff --git a/src/test_only_plugins/jira_ac/migrations/__init__.py b/src/new_sentry_plugins/jira_ac/migrations/__init__.py similarity index 100% rename from src/test_only_plugins/jira_ac/migrations/__init__.py rename to src/new_sentry_plugins/jira_ac/migrations/__init__.py diff --git a/src/test_only_plugins/jira_ac/models.py b/src/new_sentry_plugins/jira_ac/models.py similarity index 94% rename from src/test_only_plugins/jira_ac/models.py rename to src/new_sentry_plugins/jira_ac/models.py index 9dcd73a4a693d0..7f4e94f4a22353 100644 --- a/src/test_only_plugins/jira_ac/models.py +++ b/src/new_sentry_plugins/jira_ac/models.py @@ -7,7 +7,7 @@ from django.db import models from sentry.db.models import Model, FlexibleForeignKey -from test_only_plugins.jira_ac.utils import get_query_hash +from new_sentry_plugins.jira_ac.utils import get_query_hash class JiraTenant(Model): diff --git a/src/test_only_plugins/jira_ac/plugin.py b/src/new_sentry_plugins/jira_ac/plugin.py similarity index 75% rename from src/test_only_plugins/jira_ac/plugin.py rename to src/new_sentry_plugins/jira_ac/plugin.py index c7254b9c0a9c5d..0ce9a064e785b1 100644 --- a/src/test_only_plugins/jira_ac/plugin.py +++ b/src/new_sentry_plugins/jira_ac/plugin.py @@ -2,7 +2,7 @@ from sentry.plugins.base import Plugin -from test_only_plugins.base import CorePluginMixin +from new_sentry_plugins.base import CorePluginMixin class JiraACPlugin(CorePluginMixin, Plugin): @@ -13,4 +13,4 @@ class JiraACPlugin(CorePluginMixin, Plugin): conf_key = "jira-ac" def get_url_module(self): - return "test_only_plugins.jira_ac.urls" + return "new_sentry_plugins.jira_ac.urls" diff --git a/src/test_only_plugins/jira_ac/templates/base.html b/src/new_sentry_plugins/jira_ac/templates/base.html similarity index 100% rename from src/test_only_plugins/jira_ac/templates/base.html rename to src/new_sentry_plugins/jira_ac/templates/base.html diff --git a/src/test_only_plugins/jira_ac/templates/config.html b/src/new_sentry_plugins/jira_ac/templates/config.html similarity index 100% rename from src/test_only_plugins/jira_ac/templates/config.html rename to src/new_sentry_plugins/jira_ac/templates/config.html diff --git a/src/test_only_plugins/jira_ac/templates/error.html b/src/new_sentry_plugins/jira_ac/templates/error.html similarity index 100% rename from src/test_only_plugins/jira_ac/templates/error.html rename to src/new_sentry_plugins/jira_ac/templates/error.html diff --git a/src/test_only_plugins/jira_ac/templates/signin.html b/src/new_sentry_plugins/jira_ac/templates/signin.html similarity index 100% rename from src/test_only_plugins/jira_ac/templates/signin.html rename to src/new_sentry_plugins/jira_ac/templates/signin.html diff --git a/src/test_only_plugins/jira_ac/templates/widget.html b/src/new_sentry_plugins/jira_ac/templates/widget.html similarity index 100% rename from src/test_only_plugins/jira_ac/templates/widget.html rename to src/new_sentry_plugins/jira_ac/templates/widget.html diff --git a/src/test_only_plugins/jira_ac/urls.py b/src/new_sentry_plugins/jira_ac/urls.py similarity index 90% rename from src/test_only_plugins/jira_ac/urls.py rename to src/new_sentry_plugins/jira_ac/urls.py index 7017e81b185460..e1f4e48edbe81b 100644 --- a/src/test_only_plugins/jira_ac/urls.py +++ b/src/new_sentry_plugins/jira_ac/urls.py @@ -2,7 +2,7 @@ from django.conf.urls import patterns, url -from test_only_plugins.jira_ac.views import ( +from new_sentry_plugins.jira_ac.views import ( JiraConfigView, JiraDescriptorView, JiraInstalledCallback, diff --git a/src/test_only_plugins/jira_ac/utils.py b/src/new_sentry_plugins/jira_ac/utils.py similarity index 95% rename from src/test_only_plugins/jira_ac/utils.py rename to src/new_sentry_plugins/jira_ac/utils.py index 016bb1ebaa2fa0..5012531483207a 100644 --- a/src/test_only_plugins/jira_ac/utils.py +++ b/src/new_sentry_plugins/jira_ac/utils.py @@ -5,7 +5,7 @@ from six.moves.urllib.parse import quote -from test_only_plugins.exceptions import ApiError +from new_sentry_plugins.exceptions import ApiError def percent_encode(val): @@ -51,7 +51,7 @@ def get_jira_auth_from_request(request): issuer = decoded["iss"] # Look up the sharedSecret for the clientKey, as stored # by the add-on during the installation handshake - from test_only_plugins.jira_ac.models import JiraTenant + from new_sentry_plugins.jira_ac.models import JiraTenant jira_auth = JiraTenant.objects.get(client_key=issuer) # Verify the signature with the sharedSecret and diff --git a/src/test_only_plugins/jira_ac/views.py b/src/new_sentry_plugins/jira_ac/views.py similarity index 97% rename from src/test_only_plugins/jira_ac/views.py rename to src/new_sentry_plugins/jira_ac/views.py index b9e68b7b3e4987..2bfe41209cda43 100644 --- a/src/test_only_plugins/jira_ac/views.py +++ b/src/new_sentry_plugins/jira_ac/views.py @@ -15,9 +15,9 @@ from sentry.utils.http import absolute_uri from sentry.web.helpers import render_to_response -from test_only_plugins.jira_ac.forms import JiraConfigForm -from test_only_plugins.jira_ac.models import JiraTenant -from test_only_plugins.jira_ac.utils import get_jira_auth_from_request, ApiError +from new_sentry_plugins.jira_ac.forms import JiraConfigForm +from new_sentry_plugins.jira_ac.models import JiraTenant +from new_sentry_plugins.jira_ac.utils import get_jira_auth_from_request, ApiError from jwt.exceptions import ExpiredSignatureError JIRA_KEY = "%s.jira_ac" % (urlparse(absolute_uri()).hostname,) diff --git a/src/test_only_plugins/phabricator/__init__.py b/src/new_sentry_plugins/phabricator/__init__.py similarity index 100% rename from src/test_only_plugins/phabricator/__init__.py rename to src/new_sentry_plugins/phabricator/__init__.py diff --git a/src/test_only_plugins/phabricator/plugin.py b/src/new_sentry_plugins/phabricator/plugin.py similarity index 98% rename from src/test_only_plugins/phabricator/plugin.py rename to src/new_sentry_plugins/phabricator/plugin.py index 94e332c77bc7ba..e870819fc4c469 100644 --- a/src/test_only_plugins/phabricator/plugin.py +++ b/src/new_sentry_plugins/phabricator/plugin.py @@ -6,8 +6,8 @@ from sentry.utils.http import absolute_uri from six.moves.urllib.parse import urljoin -from test_only_plugins.base import CorePluginMixin -from test_only_plugins.utils import get_secret_field_config +from new_sentry_plugins.base import CorePluginMixin +from new_sentry_plugins.utils import get_secret_field_config import httplib import json diff --git a/src/test_only_plugins/pivotal/__init__.py b/src/new_sentry_plugins/pivotal/__init__.py similarity index 57% rename from src/test_only_plugins/pivotal/__init__.py rename to src/new_sentry_plugins/pivotal/__init__.py index ee890de8ecb876..49b0760b467f1f 100644 --- a/src/test_only_plugins/pivotal/__init__.py +++ b/src/new_sentry_plugins/pivotal/__init__.py @@ -1,5 +1,5 @@ from __future__ import absolute_import -from test_only_plugins.base import assert_package_not_installed +from new_sentry_plugins.base import assert_package_not_installed assert_package_not_installed("sentry-pivotal") diff --git a/src/test_only_plugins/pivotal/plugin.py b/src/new_sentry_plugins/pivotal/plugin.py similarity index 98% rename from src/test_only_plugins/pivotal/plugin.py rename to src/new_sentry_plugins/pivotal/plugin.py index 8b131e0d59198e..ef6856439f7f90 100644 --- a/src/test_only_plugins/pivotal/plugin.py +++ b/src/new_sentry_plugins/pivotal/plugin.py @@ -10,8 +10,8 @@ from sentry.utils import json from six.moves.urllib.parse import urlencode -from test_only_plugins.base import CorePluginMixin -from test_only_plugins.utils import get_secret_field_config +from new_sentry_plugins.base import CorePluginMixin +from new_sentry_plugins.utils import get_secret_field_config class PivotalPlugin(CorePluginMixin, IssuePlugin2): diff --git a/src/test_only_plugins/pushover/__init__.py b/src/new_sentry_plugins/pushover/__init__.py similarity index 57% rename from src/test_only_plugins/pushover/__init__.py rename to src/new_sentry_plugins/pushover/__init__.py index 4ab73a7ae58fb1..9b498c7e997a3f 100644 --- a/src/test_only_plugins/pushover/__init__.py +++ b/src/new_sentry_plugins/pushover/__init__.py @@ -1,5 +1,5 @@ from __future__ import absolute_import -from test_only_plugins.base import assert_package_not_installed +from new_sentry_plugins.base import assert_package_not_installed assert_package_not_installed("sentry-pushover") diff --git a/src/test_only_plugins/pushover/client.py b/src/new_sentry_plugins/pushover/client.py similarity index 94% rename from src/test_only_plugins/pushover/client.py rename to src/new_sentry_plugins/pushover/client.py index 5e0ab6bf95348a..e2f33cbb9b96dd 100644 --- a/src/test_only_plugins/pushover/client.py +++ b/src/new_sentry_plugins/pushover/client.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -from test_only_plugins.client import ApiClient +from new_sentry_plugins.client import ApiClient class PushoverClient(ApiClient): diff --git a/src/test_only_plugins/pushover/plugin.py b/src/new_sentry_plugins/pushover/plugin.py similarity index 97% rename from src/test_only_plugins/pushover/plugin.py rename to src/new_sentry_plugins/pushover/plugin.py index 358a06376fdd79..1037a20bd02b67 100644 --- a/src/test_only_plugins/pushover/plugin.py +++ b/src/new_sentry_plugins/pushover/plugin.py @@ -4,8 +4,8 @@ from sentry.plugins.bases.notify import NotifyPlugin -from test_only_plugins.base import CorePluginMixin -from test_only_plugins.utils import get_secret_field_config +from new_sentry_plugins.base import CorePluginMixin +from new_sentry_plugins.utils import get_secret_field_config from .client import PushoverClient diff --git a/src/test_only_plugins/segment/__init__.py b/src/new_sentry_plugins/segment/__init__.py similarity index 100% rename from src/test_only_plugins/segment/__init__.py rename to src/new_sentry_plugins/segment/__init__.py diff --git a/src/test_only_plugins/segment/plugin.py b/src/new_sentry_plugins/segment/plugin.py similarity index 97% rename from src/test_only_plugins/segment/plugin.py rename to src/new_sentry_plugins/segment/plugin.py index 16738e855d2f58..f609698d3cd183 100644 --- a/src/test_only_plugins/segment/plugin.py +++ b/src/new_sentry_plugins/segment/plugin.py @@ -3,8 +3,8 @@ from sentry import http from sentry.plugins.bases.data_forwarding import DataForwardingPlugin -from test_only_plugins.base import CorePluginMixin -from test_only_plugins.utils import get_secret_field_config +from new_sentry_plugins.base import CorePluginMixin +from new_sentry_plugins.utils import get_secret_field_config class SegmentPlugin(CorePluginMixin, DataForwardingPlugin): diff --git a/src/test_only_plugins/splunk/README.rst b/src/new_sentry_plugins/splunk/README.rst similarity index 100% rename from src/test_only_plugins/splunk/README.rst rename to src/new_sentry_plugins/splunk/README.rst diff --git a/src/test_only_plugins/splunk/__init__.py b/src/new_sentry_plugins/splunk/__init__.py similarity index 100% rename from src/test_only_plugins/splunk/__init__.py rename to src/new_sentry_plugins/splunk/__init__.py diff --git a/src/test_only_plugins/splunk/plugin.py b/src/new_sentry_plugins/splunk/plugin.py similarity index 98% rename from src/test_only_plugins/splunk/plugin.py rename to src/new_sentry_plugins/splunk/plugin.py index b5bfa39c76e5b9..4adccc419095de 100644 --- a/src/test_only_plugins/splunk/plugin.py +++ b/src/new_sentry_plugins/splunk/plugin.py @@ -27,9 +27,9 @@ from sentry.utils import metrics from sentry.utils.hashlib import md5_text -from test_only_plugins.base import CorePluginMixin -from test_only_plugins.utils import get_secret_field_config -from test_only_plugins.anonymizeip import anonymize_ip +from new_sentry_plugins.base import CorePluginMixin +from new_sentry_plugins.utils import get_secret_field_config +from new_sentry_plugins.anonymizeip import anonymize_ip logger = logging.getLogger(__name__) diff --git a/src/test_only_plugins/victorops/__init__.py b/src/new_sentry_plugins/victorops/__init__.py similarity index 100% rename from src/test_only_plugins/victorops/__init__.py rename to src/new_sentry_plugins/victorops/__init__.py diff --git a/src/test_only_plugins/victorops/client.py b/src/new_sentry_plugins/victorops/client.py similarity index 96% rename from src/test_only_plugins/victorops/client.py rename to src/new_sentry_plugins/victorops/client.py index 6ef2e9ec4c02b5..a80b04569a1683 100644 --- a/src/test_only_plugins/victorops/client.py +++ b/src/new_sentry_plugins/victorops/client.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -from test_only_plugins.client import ApiClient +from new_sentry_plugins.client import ApiClient class VictorOpsClient(ApiClient): diff --git a/src/test_only_plugins/victorops/plugin.py b/src/new_sentry_plugins/victorops/plugin.py similarity index 94% rename from src/test_only_plugins/victorops/plugin.py rename to src/new_sentry_plugins/victorops/plugin.py index dd3d03f344254f..17270f35f504c6 100644 --- a/src/test_only_plugins/victorops/plugin.py +++ b/src/new_sentry_plugins/victorops/plugin.py @@ -5,9 +5,9 @@ from sentry.exceptions import PluginError from sentry.plugins.bases.notify import NotifyPlugin -from test_only_plugins.base import CorePluginMixin -from test_only_plugins.exceptions import ApiError -from test_only_plugins.utils import get_secret_field_config +from new_sentry_plugins.base import CorePluginMixin +from new_sentry_plugins.exceptions import ApiError +from new_sentry_plugins.utils import get_secret_field_config from .client import VictorOpsClient diff --git a/src/test_only_plugins/vsts/.gitignore b/src/new_sentry_plugins/vsts/.gitignore similarity index 100% rename from src/test_only_plugins/vsts/.gitignore rename to src/new_sentry_plugins/vsts/.gitignore diff --git a/src/test_only_plugins/vsts/LICENSE b/src/new_sentry_plugins/vsts/LICENSE similarity index 100% rename from src/test_only_plugins/vsts/LICENSE rename to src/new_sentry_plugins/vsts/LICENSE diff --git a/src/test_only_plugins/vsts/README.rst b/src/new_sentry_plugins/vsts/README.rst similarity index 100% rename from src/test_only_plugins/vsts/README.rst rename to src/new_sentry_plugins/vsts/README.rst diff --git a/src/test_only_plugins/vsts/__init__.py b/src/new_sentry_plugins/vsts/__init__.py similarity index 100% rename from src/test_only_plugins/vsts/__init__.py rename to src/new_sentry_plugins/vsts/__init__.py diff --git a/src/test_only_plugins/vsts/client.py b/src/new_sentry_plugins/vsts/client.py similarity index 98% rename from src/test_only_plugins/vsts/client.py rename to src/new_sentry_plugins/vsts/client.py index afb3f1a8645571..1352ff953a7493 100644 --- a/src/test_only_plugins/vsts/client.py +++ b/src/new_sentry_plugins/vsts/client.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -from test_only_plugins.client import AuthApiClient +from new_sentry_plugins.client import AuthApiClient UNSET = object() diff --git a/src/test_only_plugins/vsts/mixins.py b/src/new_sentry_plugins/vsts/mixins.py similarity index 84% rename from src/test_only_plugins/vsts/mixins.py rename to src/new_sentry_plugins/vsts/mixins.py index 843ec54affba31..5d1b802c0760d7 100644 --- a/src/test_only_plugins/vsts/mixins.py +++ b/src/new_sentry_plugins/vsts/mixins.py @@ -4,8 +4,8 @@ from sentry.exceptions import PluginError -from test_only_plugins.base import CorePluginMixin -from test_only_plugins.constants import ERR_UNAUTHORIZED +from new_sentry_plugins.base import CorePluginMixin +from new_sentry_plugins.constants import ERR_UNAUTHORIZED from .client import VstsClient diff --git a/src/test_only_plugins/vsts/plugin.py b/src/new_sentry_plugins/vsts/plugin.py similarity index 100% rename from src/test_only_plugins/vsts/plugin.py rename to src/new_sentry_plugins/vsts/plugin.py diff --git a/src/test_only_plugins/vsts/repository_provider.py b/src/new_sentry_plugins/vsts/repository_provider.py similarity index 100% rename from src/test_only_plugins/vsts/repository_provider.py rename to src/new_sentry_plugins/vsts/repository_provider.py diff --git a/src/test_only_plugins/vsts/testutils.py b/src/new_sentry_plugins/vsts/testutils.py similarity index 100% rename from src/test_only_plugins/vsts/testutils.py rename to src/new_sentry_plugins/vsts/testutils.py diff --git a/src/sentry/testutils/cases.py b/src/sentry/testutils/cases.py index a9cb1203c51274..7d085897d82b39 100644 --- a/src/sentry/testutils/cases.py +++ b/src/sentry/testutils/cases.py @@ -674,19 +674,6 @@ def assertAppInstalled(self, name, path): ) self.fail("Missing app from entry_points: %r" % (name,)) - # TODO (Steve): remove function - def assertTestOnlyAppInstalled(self, name, path): - for ep in iter_entry_points("sentry.test_only_apps"): - if ep.name == name: - ep_path = ep.module_name - if ep_path == path: - return - self.fail( - "Found app in entry_points, but wrong class. Got %r, expected %r" - % (ep_path, path) - ) - self.fail("Missing app from entry_points: %r" % (name,)) - # TODO (Steve): remove function def assertNewAppInstalled(self, name, path): for ep in iter_entry_points("sentry.new_apps"): diff --git a/src/test_only_plugins/github/__init__.py b/src/test_only_plugins/github/__init__.py deleted file mode 100644 index 9d0f3baf9f263d..00000000000000 --- a/src/test_only_plugins/github/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from __future__ import absolute_import - -from test_only_plugins.base import assert_package_not_installed - -assert_package_not_installed("sentry-github") - -from test_only_plugins.github import options # NOQA diff --git a/tests/sentry_plugins/asana/test_plugin.py b/tests/sentry_plugins/asana/test_plugin.py index d1a0e8c38da581..f5a818ef2a23c1 100644 --- a/tests/sentry_plugins/asana/test_plugin.py +++ b/tests/sentry_plugins/asana/test_plugin.py @@ -10,7 +10,7 @@ from sentry.utils import json from social_auth.models import UserSocialAuth -from test_only_plugins.asana.plugin import AsanaPlugin +from new_sentry_plugins.asana.plugin import AsanaPlugin class AsanaPluginTest(PluginTestCase): @@ -26,7 +26,7 @@ def test_conf_key(self): assert self.plugin.conf_key == "asana" def test_entry_point(self): - self.assertTestOnlyPluginInstalled("asana", self.plugin) + self.assertNewPluginInstalled("asana", self.plugin) def test_get_issue_label(self): group = self.create_group(message="Hello world", culprit="foo.bar") diff --git a/tests/sentry_plugins/bitbucket/endpoints/test_webhooks.py b/tests/sentry_plugins/bitbucket/endpoints/test_webhooks.py index 0acadba72f5f9d..c92d6d73fa333e 100644 --- a/tests/sentry_plugins/bitbucket/endpoints/test_webhooks.py +++ b/tests/sentry_plugins/bitbucket/endpoints/test_webhooks.py @@ -6,8 +6,8 @@ from sentry.models import Commit, CommitAuthor, Repository from sentry.testutils import APITestCase, TestCase -from test_only_plugins.bitbucket.endpoints.webhook import parse_raw_user_email, parse_raw_user_name -from test_only_plugins.bitbucket.testutils import PUSH_EVENT_EXAMPLE +from new_sentry_plugins.bitbucket.endpoints.webhook import parse_raw_user_email, parse_raw_user_name +from new_sentry_plugins.bitbucket.testutils import PUSH_EVENT_EXAMPLE BAD_IP = "109.111.111.10" BITBUCKET_IP_IN_RANGE = "104.192.143.10" diff --git a/tests/sentry_plugins/bitbucket/test_plugin.py b/tests/sentry_plugins/bitbucket/test_plugin.py index ecf03051fd6565..c5c1361d9f1f3e 100644 --- a/tests/sentry_plugins/bitbucket/test_plugin.py +++ b/tests/sentry_plugins/bitbucket/test_plugin.py @@ -10,7 +10,7 @@ from social_auth.models import UserSocialAuth -from test_only_plugins.bitbucket.plugin import BitbucketPlugin +from new_sentry_plugins.bitbucket.plugin import BitbucketPlugin class BitbucketPluginTest(PluginTestCase): @@ -26,7 +26,7 @@ def test_conf_key(self): assert self.plugin.conf_key == "bitbucket" def test_entry_point(self): - self.assertTestOnlyPluginInstalled("bitbucket", self.plugin) + self.assertNewPluginInstalled("bitbucket", self.plugin) def test_get_issue_label(self): group = self.create_group(message="Hello world", culprit="foo.bar") diff --git a/tests/sentry_plugins/bitbucket/test_repository_provider.py b/tests/sentry_plugins/bitbucket/test_repository_provider.py index c41904bfa066a1..57ba6a1699d1b6 100644 --- a/tests/sentry_plugins/bitbucket/test_repository_provider.py +++ b/tests/sentry_plugins/bitbucket/test_repository_provider.py @@ -7,8 +7,8 @@ from sentry.testutils import PluginTestCase from social_auth.models import UserSocialAuth -from test_only_plugins.bitbucket.plugin import BitbucketRepositoryProvider -from test_only_plugins.bitbucket.testutils import COMPARE_COMMITS_EXAMPLE, COMMIT_DIFF_PATCH +from new_sentry_plugins.bitbucket.plugin import BitbucketRepositoryProvider +from new_sentry_plugins.bitbucket.testutils import COMPARE_COMMITS_EXAMPLE, COMMIT_DIFF_PATCH class BitbucketPluginTest(PluginTestCase): diff --git a/tests/sentry_plugins/clubhouse/test_plugin.py b/tests/sentry_plugins/clubhouse/test_plugin.py index bbf300a9284381..01d6660682b634 100644 --- a/tests/sentry_plugins/clubhouse/test_plugin.py +++ b/tests/sentry_plugins/clubhouse/test_plugin.py @@ -8,7 +8,7 @@ from sentry.testutils import PluginTestCase from sentry.utils import json -from test_only_plugins.clubhouse.plugin import ClubhousePlugin +from new_sentry_plugins.clubhouse.plugin import ClubhousePlugin class ClubhousePluginTest(PluginTestCase): @@ -24,7 +24,7 @@ def test_conf_key(self): assert self.plugin.conf_key == "clubhouse" def test_entry_point(self): - self.assertTestOnlyPluginInstalled("clubhouse", self.plugin) + self.assertNewPluginInstalled("clubhouse", self.plugin) def test_get_issue_label(self): group = self.create_group(message="Hello world", culprit="foo.bar") diff --git a/tests/sentry_plugins/github/endpoints/test_webhooks.py b/tests/sentry_plugins/github/endpoints/test_webhooks.py index df5565e77d1b8c..7101cd58df19c9 100644 --- a/tests/sentry_plugins/github/endpoints/test_webhooks.py +++ b/tests/sentry_plugins/github/endpoints/test_webhooks.py @@ -16,7 +16,7 @@ from sentry.testutils import APITestCase from uuid import uuid4 -from test_only_plugins.github.testutils import ( +from new_sentry_plugins.github.testutils import ( INSTALLATION_EVENT_EXAMPLE, INSTALLATION_REPO_EVENT, PUSH_EVENT_EXAMPLE, diff --git a/tests/sentry_plugins/github/test_plugin.py b/tests/sentry_plugins/github/test_plugin.py index 9fb3b38130af70..1854daa655a9f6 100644 --- a/tests/sentry_plugins/github/test_plugin.py +++ b/tests/sentry_plugins/github/test_plugin.py @@ -10,7 +10,7 @@ from sentry.utils import json from social_auth.models import UserSocialAuth -from test_only_plugins.github.plugin import GitHubPlugin +from new_sentry_plugins.github.plugin import GitHubPlugin class GitHubPluginTest(PluginTestCase): @@ -26,7 +26,7 @@ def test_conf_key(self): assert self.plugin.conf_key == "github" def test_entry_point(self): - self.assertTestOnlyPluginInstalled("github", self.plugin) + self.assertNewPluginInstalled("github", self.plugin) def test_get_issue_label(self): group = self.create_group(message="Hello world", culprit="foo.bar") diff --git a/tests/sentry_plugins/github/test_provider.py b/tests/sentry_plugins/github/test_provider.py index f060f5dd4f7fb1..101a03c7ad7222 100644 --- a/tests/sentry_plugins/github/test_provider.py +++ b/tests/sentry_plugins/github/test_provider.py @@ -9,9 +9,9 @@ from sentry.testutils import PluginTestCase from sentry.utils import json -from test_only_plugins.github.client import GitHubClient, GitHubAppsClient -from test_only_plugins.github.plugin import GitHubAppsRepositoryProvider, GitHubRepositoryProvider -from test_only_plugins.github.testutils import ( +from new_sentry_plugins.github.client import GitHubClient, GitHubAppsClient +from new_sentry_plugins.github.plugin import GitHubAppsRepositoryProvider, GitHubRepositoryProvider +from new_sentry_plugins.github.testutils import ( COMPARE_COMMITS_EXAMPLE, GET_LAST_COMMITS_EXAMPLE, INTSTALLATION_REPOSITORIES_API_RESPONSE, diff --git a/tests/sentry_plugins/gitlab/test_plugin.py b/tests/sentry_plugins/gitlab/test_plugin.py index 32b454243b1798..38a582acf56b33 100644 --- a/tests/sentry_plugins/gitlab/test_plugin.py +++ b/tests/sentry_plugins/gitlab/test_plugin.py @@ -8,7 +8,7 @@ from sentry.testutils import PluginTestCase from sentry.utils import json -from test_only_plugins.gitlab.plugin import GitLabPlugin +from new_sentry_plugins.gitlab.plugin import GitLabPlugin class GitLabPluginTest(PluginTestCase): @@ -24,7 +24,7 @@ def test_conf_key(self): assert self.plugin.conf_key == "gitlab" def test_entry_point(self): - self.assertTestOnlyPluginInstalled("gitlab", self.plugin) + self.assertNewPluginInstalled("gitlab", self.plugin) def test_get_issue_label(self): group = self.create_group(message="Hello world", culprit="foo.bar") diff --git a/tests/sentry_plugins/heroku/test_plugin.py b/tests/sentry_plugins/heroku/test_plugin.py index 13b95a05630c79..4773d0f817a928 100644 --- a/tests/sentry_plugins/heroku/test_plugin.py +++ b/tests/sentry_plugins/heroku/test_plugin.py @@ -20,7 +20,7 @@ ) from sentry.testutils import TestCase -from test_only_plugins.heroku.plugin import HerokuReleaseHook +from new_sentry_plugins.heroku.plugin import HerokuReleaseHook class SetRefsTest(TestCase): diff --git a/tests/sentry_plugins/jira/test_plugin.py b/tests/sentry_plugins/jira/test_plugin.py index bb8a2643c934e9..c029f8dab24b42 100644 --- a/tests/sentry_plugins/jira/test_plugin.py +++ b/tests/sentry_plugins/jira/test_plugin.py @@ -9,7 +9,7 @@ from sentry.testutils import TestCase from sentry.utils import json -from test_only_plugins.jira.plugin import JiraPlugin +from new_sentry_plugins.jira.plugin import JiraPlugin create_meta_response = { "expand": "projects", diff --git a/tests/sentry_plugins/jira_ac/test_plugin.py b/tests/sentry_plugins/jira_ac/test_plugin.py index 9c71bdf87e592f..56bc1388032ded 100644 --- a/tests/sentry_plugins/jira_ac/test_plugin.py +++ b/tests/sentry_plugins/jira_ac/test_plugin.py @@ -4,7 +4,7 @@ from django.test import RequestFactory from sentry.testutils import PluginTestCase -from test_only_plugins.jira_ac.plugin import JiraACPlugin +from new_sentry_plugins.jira_ac.plugin import JiraACPlugin class JiraPluginTest(PluginTestCase): @@ -20,5 +20,5 @@ def test_conf_key(self): assert self.plugin.conf_key == "jira-ac" def test_entry_point(self): - self.assertTestOnlyAppInstalled("jira_ac", "test_only_plugins.jira_ac") - self.assertTestOnlyPluginInstalled("jira_ac", self.plugin) + self.assertNewAppInstalled("jira_ac", "new_sentry_plugins.jira_ac") + self.assertNewPluginInstalled("jira_ac", self.plugin) diff --git a/tests/sentry_plugins/phabricator/test_plugin.py b/tests/sentry_plugins/phabricator/test_plugin.py index 6c009e743dfcc9..f97be2b438e4f9 100644 --- a/tests/sentry_plugins/phabricator/test_plugin.py +++ b/tests/sentry_plugins/phabricator/test_plugin.py @@ -6,7 +6,7 @@ from django.test import RequestFactory from sentry.testutils import PluginTestCase -from test_only_plugins.phabricator.plugin import PhabricatorPlugin +from new_sentry_plugins.phabricator.plugin import PhabricatorPlugin class PhabricatorPluginTest(PluginTestCase): @@ -22,7 +22,7 @@ def test_conf_key(self): assert self.plugin.conf_key == "phabricator" def test_entry_point(self): - self.assertTestOnlyPluginInstalled("phabricator", self.plugin) + self.assertNewPluginInstalled("phabricator", self.plugin) def test_get_issue_label(self): group = self.create_group(message="Hello world", culprit="foo.bar") diff --git a/tests/sentry_plugins/pivotal/test_pivotal_plugin.py b/tests/sentry_plugins/pivotal/test_pivotal_plugin.py index 32ec8d7f7dd4a5..e868ded2603f0a 100644 --- a/tests/sentry_plugins/pivotal/test_pivotal_plugin.py +++ b/tests/sentry_plugins/pivotal/test_pivotal_plugin.py @@ -5,7 +5,7 @@ from sentry.testutils import PluginTestCase from sentry.utils import json -from test_only_plugins.pivotal.plugin import PivotalPlugin +from new_sentry_plugins.pivotal.plugin import PivotalPlugin class PivotalPluginTest(PluginTestCase): @@ -17,7 +17,7 @@ def test_conf_key(self): assert self.plugin.conf_key == "pivotal" def test_entry_point(self): - self.assertTestOnlyPluginInstalled("pivotal", self.plugin) + self.assertNewPluginInstalled("pivotal", self.plugin) def test_get_issue_label(self): group = self.create_group(message="Hello world", culprit="foo.bar") diff --git a/tests/sentry_plugins/pushover/test_plugin.py b/tests/sentry_plugins/pushover/test_plugin.py index 0381649a5d18be..1f177e68d09cea 100644 --- a/tests/sentry_plugins/pushover/test_plugin.py +++ b/tests/sentry_plugins/pushover/test_plugin.py @@ -10,7 +10,7 @@ from sentry.utils import json from six.moves.urllib.parse import parse_qs -from test_only_plugins.pushover.plugin import PushoverPlugin +from new_sentry_plugins.pushover.plugin import PushoverPlugin SUCCESS = """{"status":1,"request":"e460545a8b333d0da2f3602aff3133d6"}""" @@ -24,7 +24,7 @@ def test_conf_key(self): assert self.plugin.conf_key == "pushover" def test_entry_point(self): - self.assertTestOnlyPluginInstalled("pushover", self.plugin) + self.assertNewPluginInstalled("pushover", self.plugin) def test_is_configured(self): assert self.plugin.is_configured(self.project) is False diff --git a/tests/sentry_plugins/segment/test_plugin.py b/tests/sentry_plugins/segment/test_plugin.py index 6151bfcdb834fb..9a17a6f57801ea 100644 --- a/tests/sentry_plugins/segment/test_plugin.py +++ b/tests/sentry_plugins/segment/test_plugin.py @@ -6,7 +6,7 @@ from sentry.testutils import PluginTestCase from sentry.utils import json -from test_only_plugins.segment.plugin import SegmentPlugin +from new_sentry_plugins.segment.plugin import SegmentPlugin class SegmentPluginTest(PluginTestCase): @@ -18,7 +18,7 @@ def test_conf_key(self): assert self.plugin.conf_key == "segment" def test_entry_point(self): - self.assertTestOnlyPluginInstalled("segment", self.plugin) + self.assertNewPluginInstalled("segment", self.plugin) @responses.activate def test_simple_notification(self): diff --git a/tests/sentry_plugins/splunk/test_plugin.py b/tests/sentry_plugins/splunk/test_plugin.py index cbc3989e8ad894..a5fe0c9f46c513 100644 --- a/tests/sentry_plugins/splunk/test_plugin.py +++ b/tests/sentry_plugins/splunk/test_plugin.py @@ -6,7 +6,7 @@ from sentry.testutils import PluginTestCase from sentry.utils import json -from test_only_plugins.splunk.plugin import SplunkPlugin +from new_sentry_plugins.splunk.plugin import SplunkPlugin class SplunkPluginTest(PluginTestCase): @@ -18,7 +18,7 @@ def test_conf_key(self): assert self.plugin.conf_key == "splunk" def test_entry_point(self): - self.assertTestOnlyPluginInstalled("splunk", self.plugin) + self.assertNewPluginInstalled("splunk", self.plugin) @responses.activate def test_simple_notification(self): diff --git a/tests/sentry_plugins/test_anonymizeip.py b/tests/sentry_plugins/test_anonymizeip.py index 0c1f0091bd483a..2d9f8e38cd29e8 100644 --- a/tests/sentry_plugins/test_anonymizeip.py +++ b/tests/sentry_plugins/test_anonymizeip.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -from test_only_plugins.anonymizeip import anonymize_ip +from new_sentry_plugins.anonymizeip import anonymize_ip def test_ipv6(): diff --git a/tests/sentry_plugins/test_client.py b/tests/sentry_plugins/test_client.py index 29a05abbef67c1..a17ee294cf8bdf 100644 --- a/tests/sentry_plugins/test_client.py +++ b/tests/sentry_plugins/test_client.py @@ -6,13 +6,13 @@ from mock import Mock from sentry.testutils import TestCase -from test_only_plugins.exceptions import ( +from new_sentry_plugins.exceptions import ( ApiError, ApiHostError, ApiUnauthorized, UnsupportedResponseType, ) -from test_only_plugins.client import ApiClient, AuthApiClient +from new_sentry_plugins.client import ApiClient, AuthApiClient class ApiClientTest(TestCase): diff --git a/tests/sentry_plugins/victorops/test_plugin.py b/tests/sentry_plugins/victorops/test_plugin.py index c751b4d92aa82f..bf9c101cc76a29 100644 --- a/tests/sentry_plugins/victorops/test_plugin.py +++ b/tests/sentry_plugins/victorops/test_plugin.py @@ -8,7 +8,7 @@ from sentry.testutils import PluginTestCase from sentry.utils import json -from test_only_plugins.victorops.plugin import VictorOpsPlugin +from new_sentry_plugins.victorops.plugin import VictorOpsPlugin SUCCESS = """{ "result":"success", @@ -37,7 +37,7 @@ def test_conf_key(self): assert self.plugin.conf_key == "victorops" def test_entry_point(self): - self.assertTestOnlyPluginInstalled("victorops", self.plugin) + self.assertNewPluginInstalled("victorops", self.plugin) def test_is_configured(self): assert self.plugin.is_configured(self.project) is False diff --git a/tests/sentry_plugins/vsts/test_plugin.py b/tests/sentry_plugins/vsts/test_plugin.py index 41a54c96338cfc..dc66c680916be5 100644 --- a/tests/sentry_plugins/vsts/test_plugin.py +++ b/tests/sentry_plugins/vsts/test_plugin.py @@ -11,7 +11,7 @@ from sentry.utils import json from social_auth.models import UserSocialAuth -from test_only_plugins.vsts.plugin import VstsPlugin +from new_sentry_plugins.vsts.plugin import VstsPlugin WORK_ITEM_RESPONSE = """{ "id": 309, @@ -72,7 +72,7 @@ def test_conf_key(self): assert self.plugin.conf_key == "vsts" def test_entry_point(self): - self.assertTestOnlyPluginInstalled("vsts", self.plugin) + self.assertNewPluginInstalled("vsts", self.plugin) def test_get_issue_label(self): group = self.create_group(message="Hello world", culprit="foo.bar") diff --git a/tests/sentry_plugins/vsts/test_provider.py b/tests/sentry_plugins/vsts/test_provider.py index 70b09c0825e2dd..ae4209fb4da0c6 100644 --- a/tests/sentry_plugins/vsts/test_provider.py +++ b/tests/sentry_plugins/vsts/test_provider.py @@ -7,8 +7,8 @@ from sentry.testutils import PluginTestCase from sentry.models import Repository -from test_only_plugins.vsts.repository_provider import VisualStudioRepositoryProvider -from test_only_plugins.vsts.testutils import COMPARE_COMMITS_EXAMPLE, FILE_CHANGES_EXAMPLE +from new_sentry_plugins.vsts.repository_provider import VisualStudioRepositoryProvider +from new_sentry_plugins.vsts.testutils import COMPARE_COMMITS_EXAMPLE, FILE_CHANGES_EXAMPLE class VisualStudioRepositoryProviderPluginTest(PluginTestCase):