diff --git a/conftest.py b/conftest.py index 1b211455b..936dffbcf 100644 --- a/conftest.py +++ b/conftest.py @@ -122,11 +122,23 @@ def sqlalchemy_db(request: pytest.FixtureRequest, django_db_blocker, django_db_s original_test_name = settings.DATABASES["default"]["TEST"]["NAME"] settings.DATABASES["default"]["NAME"] = "sqlalchemy" settings.DATABASES["default"]["TEST"]["NAME"] = "test_postgres_sqlalchemy" + for connection in connections: + if "timeseries" in connection: + with connections[connection].cursor() as cursor: + cursor.execute( + "SELECT _timescaledb_internal.stop_background_workers();" + ) db_cfg = setup_databases( verbosity=request.config.option.verbose, interactive=False, keepdb=keepdb, ) + for connection in connections: + if "timeseries" in connection: + with connections[connection].cursor() as cursor: + cursor.execute( + "SELECT _timescaledb_internal.start_background_workers();" + ) settings.DATABASES["default"]["NAME"] = original_db_name settings.DATABASES["default"]["TEST"]["NAME"] = original_test_name diff --git a/services/urls.py b/services/urls.py index ad7a625d2..d7655e8fe 100644 --- a/services/urls.py +++ b/services/urls.py @@ -199,12 +199,16 @@ def get_plan_url(pull: Pull) -> str: def get_test_analytics_url(repo: Repository, commit: Commit) -> str: + if commit.branch is not None: + branch_name = quote_plus(commit.branch) + else: + branch_name = quote_plus(repo.branch) return SiteUrls.test_analytics_url.get_url( dashboard_base_url=get_dashboard_base_url(), service_short=services_short_dict.get(repo.service), username=repo.owner.username, project_name=repo.name, - branch_name=quote_plus(commit.branch), + branch_name=branch_name, )