test: upgrade test to latest version of eventsourcingdb

Author: atstaeff

eventsourcingdb_client_python/handlers/observe_events/observe_events.py

@@ -50,7 +50,7 @@ async def observe_events(
     response: Response
     try:
         response = await client.http_client.post(
-            path='/api/observe-events',
+            path='/api/v1/observe-events',
             request_body=request_body,
         )
     except CustomError as custom_error:

eventsourcingdb_client_python/handlers/ping.py

@@ -1,12 +1,22 @@
 from http import HTTPStatus
+import json
 
 from ..abstract_base_client import AbstractBaseClient
 from ..errors.server_error import ServerError
 
-
 async def ping(client: AbstractBaseClient) -> None:
-    response = await client.http_client.get('/api/ping')
+    response = await client.http_client.get('/api/v1/ping')
     response_body = bytes.decode(await response.body.read(), encoding='utf-8')
 
-    if response.status_code != HTTPStatus.OK or response_body != HTTPStatus.OK.phrase:
-        raise ServerError(f'Received unexpected response: {response_body}')
+    """if response.status_code != HTTPStatus.OK or response_body != HTTPStatus.OK.phrase:
+        raise ServerError(f'Received unexpected response: {response_body}')"""
+
+    try:
+        response_json = json.loads(response_body)
+    except json.JSONDecodeError:
+        pass
+    else:
+        if isinstance(response_json, dict) and response_json.get('status') == 'ok':
+            return
+    # Wenn weder altes noch neues Format passt
+    raise ServerError(f'Received unexpected response: {response_body}')

eventsourcingdb_client_python/handlers/read_event_types/read_event_types.py

@@ -23,7 +23,7 @@ async def read_event_types(
     response: Response
     try:
         response = await client.http_client.post(
-            path='/api/read-event-types',
+            path='/api/v1/read-event-types',
             request_body='',
         )
     except CustomError as custom_error:

eventsourcingdb_client_python/handlers/read_events/read_events.py

@@ -49,7 +49,7 @@ async def read_events(
     response: Response
     try:
         response = await client.http_client.post(
-            path='/api/read-events',
+            path='/api/v1/read-events',
             request_body=request_body,
         )
     except CustomError as custom_error:

eventsourcingdb_client_python/handlers/read_subjects/read_subjects.py

@@ -37,7 +37,7 @@ async def read_subjects(
     response: Response
     try:
         response = await client.http_client.post(
-            path='/api/read-subjects',
+            path='/api/v1/read-subjects',
             request_body=request_body,
         )
     except CustomError as custom_error:

eventsourcingdb_client_python/handlers/register_event_schema/register_event_schema.py

@@ -33,7 +33,7 @@ async def register_event_schema(
     response: Response
     try:
         response = await client.http_client.post(
-            path='/api/register-event-schema',
+            path='/api/v1/register-event-schema',
             request_body=request_body,
         )
     except CustomError as custom_error:

eventsourcingdb_client_python/handlers/write_events/write_events.py

@@ -42,7 +42,7 @@ async def write_events(
     response: Response
     try:
         response = await client.http_client.post(
-            path='/api/write-events',
+            path='/api/v1/write-events',
             request_body=request_body,
         )
     except CustomError as custom_error:

tests/shared/containerized_testing_database.py

@@ -29,6 +29,7 @@ async def create(
         access_token: str,
         options: ClientOptions = ClientOptions(),
     ) -> 'ContainerizedTestingDatabase':
+        command.extend(['--http-enabled', '--https-enabled=false'])
         container = image.run(command, True, True)
         exposed_port = container.get_exposed_port(3_000)
         base_url = f'http://127.0.0.1:{exposed_port}'

tests/shared/database.py

@@ -30,7 +30,7 @@ async def create(cls) -> 'Database':
         access_token = str(uuid.uuid4())
         with_authorization = await ContainerizedTestingDatabase.create(
             image,
-            ['run', '--access-token', f'{access_token}', '--store-temporary'],
+            ['run', '--api-token', f'{access_token}', '--data-directory-temporary'],
             access_token,
             ClientOptions()
         )

tests/shared/docker/container.py

@@ -20,7 +20,7 @@ def kill(self) -> None:
                 raise DockerCommandFailedError(
                     f'Kill failed with output: {stderr}')
 
-    def get_exposed_port(self, internal_port: int) -> int:
+    def get_exposed_port(self, internal_port: int = 3_000) -> int:
         docker_command = [
             'docker',
             'inspect',