Fix tests

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:

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

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