From 63feab6f72b3b9ef0452a0822d13d64676e79dfb Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 7 Jan 2024 11:05:36 +0100 Subject: [PATCH] Update tox.ini --- ...lysis.yml => codeql-analysis.yml.disabled} | 0 manage.py | 22 +++++++++++++++++++ test_haystack/solr_tests/server/wait-for-solr | 12 +++++++--- 3 files changed, 31 insertions(+), 3 deletions(-) rename .github/workflows/{codeql-analysis.yml => codeql-analysis.yml.disabled} (100%) create mode 100755 manage.py diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml.disabled similarity index 100% rename from .github/workflows/codeql-analysis.yml rename to .github/workflows/codeql-analysis.yml.disabled diff --git a/manage.py b/manage.py new file mode 100755 index 000000000..d28672eae --- /dev/null +++ b/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +"""Django's command-line utility for administrative tasks.""" +import os +import sys + + +def main(): + """Run administrative tasks.""" + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings") + try: + from django.core.management import execute_from_command_line + except ImportError as exc: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) from exc + execute_from_command_line(sys.argv) + + +if __name__ == "__main__": + main() diff --git a/test_haystack/solr_tests/server/wait-for-solr b/test_haystack/solr_tests/server/wait-for-solr index 88446d939..c25feeaf1 100755 --- a/test_haystack/solr_tests/server/wait-for-solr +++ b/test_haystack/solr_tests/server/wait-for-solr @@ -5,11 +5,17 @@ import time import requests -max_retries = 100 +max_retries = 10 # was 100 retry_count = 0 retry_delay = 15 -status_url = "http://localhost:9001/solr/collection1/admin/ping" - +status_url = "http://solr:8983/solr/collection1/admin/ping" +status_url = "http://localhost:8983/solr/collection1/admin/ping" + +# Fail fast if Solr is not up and running at port 8983 +try: + assert (s := requests.get(status_url).status_code) == 200, s +except AssertionError: + assert (s := requests.get("http://localhost:8983/solr").status_code) == 200, s while retry_count < max_retries: status_code = 0