From cee9ecd0f047d6f40b40d1973b77bb7d6d0f6e6a Mon Sep 17 00:00:00 2001 From: Richard Tibbles Date: Thu, 8 Aug 2024 07:56:20 -0700 Subject: [PATCH] Revert use of network client in test utils. --- kolibri/core/auth/test/sync_utils.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/kolibri/core/auth/test/sync_utils.py b/kolibri/core/auth/test/sync_utils.py index 9809479b22..1d13aac66f 100644 --- a/kolibri/core/auth/test/sync_utils.py +++ b/kolibri/core/auth/test/sync_utils.py @@ -9,16 +9,16 @@ import time import uuid +import requests from django.conf import settings from django.db import connection from django.db import connections from django.utils.functional import wraps from morango.models.core import DatabaseIDModel +from requests.exceptions import RequestException from kolibri.core.auth.models import Facility from kolibri.core.auth.models import FacilityUser -from kolibri.core.discovery.utils.network.client import NetworkClient -from kolibri.core.discovery.utils.network.errors import NetworkLocationResponseFailure # custom Morango instance info used in tests CUSTOM_INSTANCE_INFO = {"kolibri": "0.14.7"} @@ -119,13 +119,12 @@ def pipe_shell(self, text): ) def _wait_for_server_start(self, timeout=20): - client = NetworkClient.build_for_address(self.baseurl, timeout=3) for i in range(timeout * 2): try: - resp = client.get("api/public/info/") + resp = requests.get(self.baseurl + "api/public/info/", timeout=3) if resp.status_code > 0: return - except NetworkLocationResponseFailure: + except RequestException: pass time.sleep(0.5)