3 files changed, 20 insertions, 6 deletions
diff --git a/src/main.py b/src/main.py
index a65971d..d6f420f 100755
--- a/src/main.py
+++ b/src/main.py
@@ -31,6 +31,23 @@ async def mock_x_total_count_header(request: Request, call_next):
     response.headers["X-Total-Count"] = "100"
     return response
 
+<< << << < HEAD
+== == == =
+for i in range(10):
+    try:
+        db = DictDB()
+    except Exception:
+        print(
+            f'Database not responding, will try again soon. Attempt {i + 1} of 10.')
+    else:
+        break
+    time.sleep(1)
+else:
+    print('Database did not respond after 10 attempts, quitting.')
+    sys.exit(-1)
+
+>>>>>> > main
+
 
 def get_pubkey():
     try:
diff --git a/src/quickstart_test.sh b/src/quickstart_test.sh
index e81024f..3d4945e 100755
--- a/src/quickstart_test.sh
+++ b/src/quickstart_test.sh
@@ -5,7 +5,6 @@ export COUCHDB_PASSWORD=test
 
 export DOCKER_JWT_PUBKEY_PATH="`pwd`/test/unittest_cert/"
 export JWT_PUBKEY_PATH="`pwd`/test/unittest_cert/public.pem"
-export JWT_TOKEN="eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NiJ9.eyJ0eXBlIjoiYWNjZXNzIiwiZG9tYWlucyI6WyJzdW5ldC5zZSJdfQ._emWyVw-6qer5u65SitS8bZJas7l8bw4almnI1TB7DBnzNsch8ctU4btlgBpfJ2jbrvXZTIl8jXIcykO4crUrQ"
 
 virtualenv=no
 couchdb=no
@@ -49,8 +48,8 @@ mkdir test/unittest_cert
 
 cat <<EOF > test/unittest_cert/public.pem
 -----BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEPW8bkkVIq4BX8eWwlUOUYbJhiGDv
-K/6xY5T0BsvV6pbMoIUfgeThVOq5I3CmXxLt+qyPska6ol9fTN7woZLsCg==
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEGHX8ipqVWtr49TXyX0f/L4GPhEpg
+N0Erzy7hHkXVrkgKpnHSRLYWgbW4rscLoJAJeEv7Be5iH0TM8l09w8Q3wQ==
 -----END PUBLIC KEY-----
 EOF
 
diff --git a/src/test/test_api.py b/src/test/test_api.py
index cabe101..9d76e5e 100644
--- a/src/test/test_api.py
+++ b/src/test/test_api.py
@@ -9,9 +9,7 @@ from fastapi import FastAPI
 from fastapi import testclient
 
 client = testclient.TestClient(app)
-JWT_TOKEN = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NiJ9.eyJ0eXBlIjoiYWNjZXNzIiwi' + \
-    'ZG9tYWlucyI6WyJzdW5ldC5zZSJdfQ._emWyVw-6qer5u65SitS8bZJas7l8bw4almnI1' + \
-    'TB7DBnzNsch8ctU4btlgBpfJ2jbrvXZTIl8jXIcykO4crUrQ'
+JWT_TOKEN = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NiJ9.eyJmcmVzaCI6ZmFsc2UsImlhdCI6MTY0MjE2ODkyMCwianRpIjoiNjM0NGFiNjEtMTIzZC00YWMyLTk3YjMtYmVlYTE2M2JiMWMwIiwidHlwZSI6ImFjY2VzcyIsInN1YiI6InVzZXIxIiwibmJmIjoxNjQyMTY4OTIwLCJyZWFkIjpbInN1bmV0LnNlIl0sIndyaXRlIjpbInN1bmV0LnNlIl19._bX9EHI9h0Vjw75UvYvypqaH3AmsgaATFSUSOT-cYLZHrfMlxios3emr7cyKw-OV_BN5h_XNyrMBV1gIoqAk3A'
 JWT_HEADER = {'Authorization': f'Bearer {JWT_TOKEN}'}