Skip to content

Commit 6782bb7

Browse files
authored
Fix octopus fixture paths on windows (#19434)
* fix octopus paths on windows * fix long paths * test * fix
1 parent ff15780 commit 6782bb7

File tree

24 files changed

+12
-5
lines changed

24 files changed

+12
-5
lines changed

octopus_deploy/tests/conftest.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,17 @@ def method(method, url, file='response', headers=None, params=None):
9090
param_string = ""
9191
for key, val in params.items():
9292
if type(val) is list:
93-
val_string = ','.join(f'{str(val_item)}' for val_item in val)
93+
if len(val) < 5:
94+
val_string = ','.join(f'{str(val_item)}' for val_item in val)
95+
else:
96+
# don't use full list as the path is too long
97+
val_string = '[]'
9498
else:
9599
val_string = str(val)
96100
param_string += ("/" if param_string else "") + f'{key}={val_string}'
101+
param_string = param_string.replace(':', '_')
102+
param_string = param_string.replace('+00_00', '')
103+
param_string = param_string.replace('2024-09-23 ', '')
97104
request_path = '{}/{}'.format(url, param_string)
98105
print(request_path)
99106
response = responses_map.get(method, {}).get(request_path, {}).get(filename)

octopus_deploy/tests/docker/Caddyfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
expression {query.project}.contains("Projects-1") && {query}.contains("fromCompletedDate") && {query}.contains("toCompletedDate")
8787
}
8888
route @get_completed_tasks_project_1 {
89-
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"
89+
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"
9090
file_server
9191
}
9292
@get_completed_tasks_project_2 {
@@ -95,7 +95,7 @@
9595
expression {query.project}.contains("Projects-2") && {query}.contains("fromCompletedDate") && {query}.contains("toCompletedDate")
9696
}
9797
route @get_completed_tasks_project_2 {
98-
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"
98+
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"
9999
file_server
100100
}
101101
@get_completed_tasks_project_3 {
@@ -104,7 +104,7 @@
104104
expression {query.project}.contains("Projects-3") && {query}.contains("fromCompletedDate") && {query}.contains("toCompletedDate")
105105
}
106106
route @get_completed_tasks_project_3 {
107-
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"
107+
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"
108108
file_server
109109
}
110110
@get_completed_tasks_project_4 {
@@ -113,7 +113,7 @@
113113
expression {query.project}.contains("Projects-4") && {query}.contains("fromCompletedDate") && {query}.contains("toCompletedDate")
114114
}
115115
route @get_completed_tasks_project_4 {
116-
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"
116+
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"
117117
file_server
118118
}
119119
@get_octopusservernodes {

0 commit comments

Comments
 (0)