From 778f8688efe8330cdbf16bffe402916643c4d082 Mon Sep 17 00:00:00 2001 From: Innokentii Konstantinov Date: Wed, 8 Jun 2022 20:15:07 +0400 Subject: [PATCH] Fix tests --- engine/apps/api/views/live_setting.py | 3 ++- engine/settings/base.py | 2 +- engine/settings/ci-test.py | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/engine/apps/api/views/live_setting.py b/engine/apps/api/views/live_setting.py index bd0fb4fd..80dbd6a7 100644 --- a/engine/apps/api/views/live_setting.py +++ b/engine/apps/api/views/live_setting.py @@ -12,7 +12,6 @@ from apps.api.serializers.live_setting import LiveSettingSerializer from apps.auth_token.auth import PluginAuthentication from apps.base.models import LiveSetting from apps.base.utils import live_settings -from apps.oss_installation.models import CloudConnector from apps.slack.tasks import unpopulate_slack_user_identities from apps.telegram.client import TelegramClient from apps.telegram.tasks import register_telegram_webhook @@ -72,6 +71,8 @@ class LiveSettingViewSet(PublicPrimaryKeyMixin, viewsets.ModelViewSet): unpopulate_slack_user_identities.apply_async((sti.pk, True), countdown=0) if instance.name == "GRAFANA_CLOUD_ONCALL_TOKEN": + from apps.oss_installation.models import CloudConnector + try: old_token = live_settings.GRAFANA_CLOUD_ONCALL_TOKEN except ImproperlyConfigured: diff --git a/engine/settings/base.py b/engine/settings/base.py index 507ae112..75966ae5 100644 --- a/engine/settings/base.py +++ b/engine/settings/base.py @@ -6,7 +6,7 @@ from celery.schedules import crontab from common.utils import getenv_boolean VERSION = "dev-oss" -OSS = getenv_boolean("OSS", True) +OSS = False SEND_ANONYMOUS_USAGE_STATS = getenv_boolean("SEND_ANONYMOUS_USAGE_STATS", default=True) # License is OpenSource or Cloud diff --git a/engine/settings/ci-test.py b/engine/settings/ci-test.py index f3c012a0..3cc2c35a 100644 --- a/engine/settings/ci-test.py +++ b/engine/settings/ci-test.py @@ -27,3 +27,4 @@ TWILIO_AUTH_TOKEN = "dummy_twilio_auth_token" FEATURE_EXTRA_MESSAGING_BACKENDS_ENABLED = True EXTRA_MESSAGING_BACKENDS = ["apps.base.tests.messaging_backend.TestOnlyBackend"] +OSS = True