From 3dd164c04cd924c7bccc532957dbbd6c7f72e597 Mon Sep 17 00:00:00 2001 From: Sarah Witt Date: Fri, 17 Jan 2025 14:22:43 -0500 Subject: [PATCH 1/4] fix octopus paths on windows --- octopus_deploy/tests/conftest.py | 1 + .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 .../skip=2/take=2/response.json | 0 .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 .../skip=2/take=2/response.json | 0 .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 23 files changed, 1 insertion(+) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/{from=2024-09-23 14:45:00.123000+00:00/to=2024-09-23 14:45:00.123000+00:00 => from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_00.123000+00_00}/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/{from=2024-09-23 14:45:00.123000+00:00/to=2024-09-23 14:45:00.123000+00:00 => from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_00.123000+00_00}/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/{from=2024-09-23 14:45:00.123000+00:00/to=2024-09-23 14:45:15.123000+00:00 => from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00}/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/{from=2024-09-23 14:45:00.123000+00:00/to=2024-09-23 14:45:15.123000+00:00 => from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00}/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/{from=2024-09-23 14:45:00.123000+00:00/to=2024-09-23 14:45:15.123000+00:00 => from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00}/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=2/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/{fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00 => fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00}/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/{fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00 => fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00}/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/{fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00 => fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00}/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/{fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00 => fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00}/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/{fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00 => fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00}/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/{fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00 => fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00}/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/{fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00 => fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00}/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/{fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00 => fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00}/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/{fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00 => fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00}/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/{fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00 => fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00}/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/{fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00 => fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00}/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/{fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00 => fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00}/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/{fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00 => fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00}/skip=2/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/{fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00 => fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00}/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/{fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00 => fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00}/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/{fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00 => fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00}/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/{fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00 => fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00}/skip=0/take=30/response.json (100%) diff --git a/octopus_deploy/tests/conftest.py b/octopus_deploy/tests/conftest.py index 8a4c18187f261..a629346abc352 100644 --- a/octopus_deploy/tests/conftest.py +++ b/octopus_deploy/tests/conftest.py @@ -94,6 +94,7 @@ def method(method, url, file='response', headers=None, params=None): else: val_string = str(val) param_string += ("/" if param_string else "") + f'{key}={val_string}' + param_string = param_string.replace(':', '_') request_path = '{}/{}'.format(url, param_string) print(request_path) response = responses_map.get(method, {}).get(request_path, {}).get(filename) diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14:45:00.123000+00:00/to=2024-09-23 14:45:00.123000+00:00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_00.123000+00_00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14:45:00.123000+00:00/to=2024-09-23 14:45:00.123000+00:00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_00.123000+00_00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14:45:00.123000+00:00/to=2024-09-23 14:45:00.123000+00:00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_00.123000+00_00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14:45:00.123000+00:00/to=2024-09-23 14:45:00.123000+00:00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_00.123000+00_00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14:45:00.123000+00:00/to=2024-09-23 14:45:15.123000+00:00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14:45:00.123000+00:00/to=2024-09-23 14:45:15.123000+00:00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14:45:00.123000+00:00/to=2024-09-23 14:45:15.123000+00:00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14:45:00.123000+00:00/to=2024-09-23 14:45:15.123000+00:00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14:45:00.123000+00:00/to=2024-09-23 14:45:15.123000+00:00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=2/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=2/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14:45:00.123000+00:00/to=2024-09-23 14:45:15.123000+00:00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=2/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=2/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00/skip=2/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=2/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00/skip=2/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=2/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:15.123000+00:00/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=30/response.json From abe40a777e37865e790085cc26ed4d690e981e45 Mon Sep 17 00:00:00 2001 From: Sarah Witt Date: Fri, 17 Jan 2025 14:32:47 -0500 Subject: [PATCH 2/4] fix long paths --- octopus_deploy/tests/conftest.py | 6 +++++- octopus_deploy/tests/docker/Caddyfile | 8 ++++---- .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 .../skip=2/take=2/response.json | 0 7 files changed, 9 insertions(+), 5 deletions(-) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_00.123000+00_00/{eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted => eventCategories=[]}/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_00.123000+00_00/{eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted => eventCategories=[]}/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/{eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted => eventCategories=[]}/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/{eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted => eventCategories=[]}/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/{eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted => eventCategories=[]}/skip=2/take=2/response.json (100%) diff --git a/octopus_deploy/tests/conftest.py b/octopus_deploy/tests/conftest.py index a629346abc352..9ab34250f8928 100644 --- a/octopus_deploy/tests/conftest.py +++ b/octopus_deploy/tests/conftest.py @@ -90,7 +90,11 @@ def method(method, url, file='response', headers=None, params=None): param_string = "" for key, val in params.items(): if type(val) is list: - val_string = ','.join(f'{str(val_item)}' for val_item in val) + if len(val) < 5: + val_string = ','.join(f'{str(val_item)}' for val_item in val) + else: + # don't use full list as the path is too long + val_string = '[]' else: val_string = str(val) param_string += ("/" if param_string else "") + f'{key}={val_string}' diff --git a/octopus_deploy/tests/docker/Caddyfile b/octopus_deploy/tests/docker/Caddyfile index b6389a9855030..277f0dbee4432 100644 --- a/octopus_deploy/tests/docker/Caddyfile +++ b/octopus_deploy/tests/docker/Caddyfile @@ -86,7 +86,7 @@ expression {query.project}.contains("Projects-1") && {query}.contains("fromCompletedDate") && {query}.contains("toCompletedDate") } route @get_completed_tasks_project_1 { - rewrite * "/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00/skip=0/take=30/response.json" + rewrite * "/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json" file_server } @get_completed_tasks_project_2 { @@ -95,7 +95,7 @@ expression {query.project}.contains("Projects-2") && {query}.contains("fromCompletedDate") && {query}.contains("toCompletedDate") } route @get_completed_tasks_project_2 { - rewrite * "/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00/skip=0/take=30/response.json" + rewrite * "/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json" file_server } @get_completed_tasks_project_3 { @@ -104,7 +104,7 @@ expression {query.project}.contains("Projects-3") && {query}.contains("fromCompletedDate") && {query}.contains("toCompletedDate") } route @get_completed_tasks_project_3 { - rewrite * "/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00/skip=0/take=30/response.json" + rewrite * "/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json" file_server } @get_completed_tasks_project_4 { @@ -113,7 +113,7 @@ expression {query.project}.contains("Projects-4") && {query}.contains("fromCompletedDate") && {query}.contains("toCompletedDate") } route @get_completed_tasks_project_4 { - rewrite * "/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14:45:00.123000+00:00/toCompletedDate=2024-09-23 14:45:00.123000+00:00/skip=0/take=30/response.json" + rewrite * "/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json" file_server } @get_octopusservernodes { diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_00.123000+00_00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_00.123000+00_00/eventCategories=[]/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_00.123000+00_00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_00.123000+00_00/eventCategories=[]/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_00.123000+00_00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_00.123000+00_00/eventCategories=[]/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_00.123000+00_00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_00.123000+00_00/eventCategories=[]/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/eventCategories=[]/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/eventCategories=[]/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/eventCategories=[]/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/eventCategories=[]/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=2/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/eventCategories=[]/skip=2/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/eventCategories=MachineHealthy,MachineUnhealthy,MachineUnavailable,CertificateExpired,DeploymentFailed,DeploymentSucceeded,LoginFailed,MachineAdded,MachineDeleted/skip=2/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/eventCategories=[]/skip=2/take=2/response.json From b32d932087d7f4371b0953956a8b9401e052a8a7 Mon Sep 17 00:00:00 2001 From: Sarah Witt Date: Fri, 17 Jan 2025 15:06:18 -0500 Subject: [PATCH 3/4] test --- octopus_deploy/tests/conftest.py | 1 + .../eventCategories=[]/skip=0/take=2/response.json | 0 .../eventCategories=[]/skip=0/take=30/response.json | 0 .../eventCategories=[]/skip=0/take=2/response.json | 0 .../eventCategories=[]/skip=0/take=30/response.json | 0 .../eventCategories=[]/skip=2/take=2/response.json | 0 .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 .../skip=2/take=2/response.json | 0 .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 23 files changed, 1 insertion(+) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/{from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_00.123000+00_00 => from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_00.123000}/eventCategories=[]/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/{from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_00.123000+00_00 => from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_00.123000}/eventCategories=[]/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/{from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00 => from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_15.123000}/eventCategories=[]/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/{from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00 => from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_15.123000}/eventCategories=[]/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/{from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00 => from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_15.123000}/eventCategories=[]/skip=2/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/{fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00 => fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000}/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/{fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00 => fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000}/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/{fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00 => fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000}/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/{fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00 => fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000}/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/{fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00 => fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000}/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/{fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00 => fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000}/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/{fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00 => fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000}/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/{fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00 => fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000}/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/{fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00 => fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000}/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/{fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00 => fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000}/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/{fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00 => fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000}/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/{fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00 => fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000}/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/{fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00 => fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000}/skip=2/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/{fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00 => fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000}/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/{fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00 => fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000}/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/{fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00 => fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000}/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/{fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00 => fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000}/skip=0/take=30/response.json (100%) diff --git a/octopus_deploy/tests/conftest.py b/octopus_deploy/tests/conftest.py index 9ab34250f8928..94bb9ac94a0e7 100644 --- a/octopus_deploy/tests/conftest.py +++ b/octopus_deploy/tests/conftest.py @@ -99,6 +99,7 @@ def method(method, url, file='response', headers=None, params=None): val_string = str(val) param_string += ("/" if param_string else "") + f'{key}={val_string}' param_string = param_string.replace(':', '_') + param_string = param_string.replace('+00_00', '') request_path = '{}/{}'.format(url, param_string) print(request_path) response = responses_map.get(method, {}).get(request_path, {}).get(filename) diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_00.123000+00_00/eventCategories=[]/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_00.123000/eventCategories=[]/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_00.123000+00_00/eventCategories=[]/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_00.123000/eventCategories=[]/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_00.123000+00_00/eventCategories=[]/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_00.123000/eventCategories=[]/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_00.123000+00_00/eventCategories=[]/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_00.123000/eventCategories=[]/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/eventCategories=[]/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_15.123000/eventCategories=[]/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/eventCategories=[]/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_15.123000/eventCategories=[]/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/eventCategories=[]/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_15.123000/eventCategories=[]/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/eventCategories=[]/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_15.123000/eventCategories=[]/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/eventCategories=[]/skip=2/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_15.123000/eventCategories=[]/skip=2/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000+00_00/to=2024-09-23 14_45_15.123000+00_00/eventCategories=[]/skip=2/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_15.123000/eventCategories=[]/skip=2/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=2/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=2/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=2/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=2/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_15.123000+00_00/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=30/response.json From adb085957d2825c94705d2ad05229b6bd6857c00 Mon Sep 17 00:00:00 2001 From: Sarah Witt Date: Fri, 17 Jan 2025 15:12:58 -0500 Subject: [PATCH 4/4] fix --- octopus_deploy/tests/conftest.py | 1 + octopus_deploy/tests/docker/Caddyfile | 8 ++++---- .../eventCategories=[]/skip=0/take=2/response.json | 0 .../eventCategories=[]/skip=0/take=30/response.json | 0 .../eventCategories=[]/skip=0/take=2/response.json | 0 .../eventCategories=[]/skip=0/take=30/response.json | 0 .../eventCategories=[]/skip=2/take=2/response.json | 0 .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 .../skip=2/take=2/response.json | 0 .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 .../skip=0/take=2/response.json | 0 .../skip=0/take=30/response.json | 0 24 files changed, 5 insertions(+), 4 deletions(-) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/{from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_00.123000 => from=14_45_00.123000/to=14_45_00.123000}/eventCategories=[]/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/{from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_00.123000 => from=14_45_00.123000/to=14_45_00.123000}/eventCategories=[]/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/{from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_15.123000 => from=14_45_00.123000/to=14_45_15.123000}/eventCategories=[]/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/{from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_15.123000 => from=14_45_00.123000/to=14_45_15.123000}/eventCategories=[]/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/{from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_15.123000 => from=14_45_00.123000/to=14_45_15.123000}/eventCategories=[]/skip=2/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/{fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000 => fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000}/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/{fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000 => fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000}/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/{fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000 => fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000}/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/{fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000 => fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000}/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/{fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000 => fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000}/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/{fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000 => fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000}/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/{fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000 => fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000}/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/{fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000 => fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000}/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/{fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000 => fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000}/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/{fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000 => fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000}/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/{fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000 => fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000}/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/{fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000 => fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000}/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/{fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000 => fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000}/skip=2/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/{fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000 => fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000}/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/{fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000 => fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000}/skip=0/take=30/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/{fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000 => fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000}/skip=0/take=2/response.json (100%) rename octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/{fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000 => fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000}/skip=0/take=30/response.json (100%) diff --git a/octopus_deploy/tests/conftest.py b/octopus_deploy/tests/conftest.py index 94bb9ac94a0e7..16bb16938d88b 100644 --- a/octopus_deploy/tests/conftest.py +++ b/octopus_deploy/tests/conftest.py @@ -100,6 +100,7 @@ def method(method, url, file='response', headers=None, params=None): param_string += ("/" if param_string else "") + f'{key}={val_string}' param_string = param_string.replace(':', '_') param_string = param_string.replace('+00_00', '') + param_string = param_string.replace('2024-09-23 ', '') request_path = '{}/{}'.format(url, param_string) print(request_path) response = responses_map.get(method, {}).get(request_path, {}).get(filename) diff --git a/octopus_deploy/tests/docker/Caddyfile b/octopus_deploy/tests/docker/Caddyfile index 277f0dbee4432..1701c520e79cd 100644 --- a/octopus_deploy/tests/docker/Caddyfile +++ b/octopus_deploy/tests/docker/Caddyfile @@ -86,7 +86,7 @@ expression {query.project}.contains("Projects-1") && {query}.contains("fromCompletedDate") && {query}.contains("toCompletedDate") } route @get_completed_tasks_project_1 { - rewrite * "/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json" + rewrite * "/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000/skip=0/take=30/response.json" file_server } @get_completed_tasks_project_2 { @@ -95,7 +95,7 @@ expression {query.project}.contains("Projects-2") && {query}.contains("fromCompletedDate") && {query}.contains("toCompletedDate") } route @get_completed_tasks_project_2 { - rewrite * "/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json" + rewrite * "/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000/skip=0/take=30/response.json" file_server } @get_completed_tasks_project_3 { @@ -104,7 +104,7 @@ expression {query.project}.contains("Projects-3") && {query}.contains("fromCompletedDate") && {query}.contains("toCompletedDate") } route @get_completed_tasks_project_3 { - rewrite * "/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json" + rewrite * "/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000/skip=0/take=30/response.json" file_server } @get_completed_tasks_project_4 { @@ -113,7 +113,7 @@ expression {query.project}.contains("Projects-4") && {query}.contains("fromCompletedDate") && {query}.contains("toCompletedDate") } route @get_completed_tasks_project_4 { - rewrite * "/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000+00_00/toCompletedDate=2024-09-23 14_45_00.123000+00_00/skip=0/take=30/response.json" + rewrite * "/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000/skip=0/take=30/response.json" file_server } @get_octopusservernodes { diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_00.123000/eventCategories=[]/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=14_45_00.123000/to=14_45_00.123000/eventCategories=[]/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_00.123000/eventCategories=[]/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=14_45_00.123000/to=14_45_00.123000/eventCategories=[]/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_00.123000/eventCategories=[]/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=14_45_00.123000/to=14_45_00.123000/eventCategories=[]/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_00.123000/eventCategories=[]/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=14_45_00.123000/to=14_45_00.123000/eventCategories=[]/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_15.123000/eventCategories=[]/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=14_45_00.123000/to=14_45_15.123000/eventCategories=[]/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_15.123000/eventCategories=[]/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=14_45_00.123000/to=14_45_15.123000/eventCategories=[]/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_15.123000/eventCategories=[]/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=14_45_00.123000/to=14_45_15.123000/eventCategories=[]/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_15.123000/eventCategories=[]/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=14_45_00.123000/to=14_45_15.123000/eventCategories=[]/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_15.123000/eventCategories=[]/skip=2/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=14_45_00.123000/to=14_45_15.123000/eventCategories=[]/skip=2/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=2024-09-23 14_45_00.123000/to=2024-09-23 14_45_15.123000/eventCategories=[]/skip=2/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/events/from=14_45_00.123000/to=14_45_15.123000/eventCategories=[]/skip=2/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-1/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-2/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=2/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000/skip=2/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=2/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-3/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000/skip=2/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_00.123000/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_00.123000/skip=0/take=30/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=2/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000/skip=0/take=2/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=2/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000/skip=0/take=2/response.json diff --git a/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=30/response.json b/octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000/skip=0/take=30/response.json similarity index 100% rename from octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=2024-09-23 14_45_00.123000/toCompletedDate=2024-09-23 14_45_15.123000/skip=0/take=30/response.json rename to octopus_deploy/tests/fixtures/GET/api/Spaces-1/tasks/name=Deploy/project=Projects-4/fromCompletedDate=14_45_00.123000/toCompletedDate=14_45_15.123000/skip=0/take=30/response.json