Skip to content

Commit e9d9ac0

Browse files
general-kroll-4-lifegeneral-kroll-4-life
committed
testing-portable
Summary: - Enhance testing portability.
1 parent 140a764 commit e9d9ac0

File tree

2 files changed

+30
-14
lines changed

2 files changed

+30
-14
lines changed

‎test/robot/functional/stackql.resource‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ ${SHOULD_RUN_DOCKER_EXTERNAL_TESTS} false # to be overridden from command l
88
${CONCURRENCY_LIMIT} 1 # to be overridden from command line, with integer value, -1 for no limit
99
${USE_STACKQL_PREINSTALLED} false # to be overridden from command line, with string "true"
1010
${SUNDRY_CONFIG} {} # to be overridden from command line, with string value
11+
${CWD_FOR_EXEC} ${REPOSITORY_ROOT} # works for self repository, can be overwritten when shared
1112

1213
*** Settings ***
1314
Library Process
@@ -19,7 +20,7 @@ Library OperatingSystem
1920
Library String
2021
Library ${LOCAL_LIB_HOME}/StackQLInterfaces.py ${EXECUTION_PLATFORM} ${SQL_BACKEND} ${CONCURRENCY_LIMIT}
2122
Library ${LOCAL_LIB_HOME}/CloudIntegration.py
22-
Library ${LOCAL_LIB_HOME}/web_service_keywords.py
23+
Library ${LOCAL_LIB_HOME}/web_service_keywords.py cwd=${CWD_FOR_EXEC}
2324

2425
*** Keywords ***
2526

‎test/robot/lib/web_service_keywords.py‎

Lines changed: 28 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,13 @@ def __init__(
4444
log_root: Optional[str] = None,
4545
app_root: Optional[str] = None,
4646
tls_key_path: Optional[str] = None,
47-
tls_cert_path: Optional[str] = None
47+
tls_cert_path: Optional[str] = None,
48+
cwd: Optional[str] = None,
4849
):
4950
_app_root: str = app_root if app_root else self._DEFAULT_APP_ROOT
5051

52+
self._cwd = os.path.abspath(cwd) if cwd else None
53+
5154
self._log_root: str = log_root if log_root else self._DEFAULT_LOG_ROOT
5255

5356
self._affirmation_store_web_service = None
@@ -87,7 +90,8 @@ def create_oauth2_client_credentials_web_service(
8790
f'--cert={self._tls_cert_path}',
8891
f'--key={self._tls_key_path}',
8992
stdout=os.path.abspath(os.path.join(self._log_root, f'token-client-credentials-{port}-stdout.txt')),
90-
stderr=os.path.abspath(os.path.join(self._log_root, f'token-client-credentials-{port}-stderr.txt'))
93+
stderr=os.path.abspath(os.path.join(self._log_root, f'token-client-credentials-{port}-stderr.txt')),
94+
cwd=self._cwd,
9195
)
9296

9397
@keyword
@@ -108,7 +112,8 @@ def create_github_web_service(
108112
f'--cert={self._tls_cert_path}',
109113
f'--key={self._tls_key_path}',
110114
stdout=os.path.abspath(os.path.join(self._log_root, f'github-server-{port}-stdout.txt')),
111-
stderr=os.path.abspath(os.path.join(self._log_root, f'github-server-{port}-stderr.txt'))
115+
stderr=os.path.abspath(os.path.join(self._log_root, f'github-server-{port}-stderr.txt')),
116+
cwd=self._cwd,
112117
)
113118

114119
@keyword
@@ -129,7 +134,8 @@ def create_gcp_web_service(
129134
f'--cert={self._tls_cert_path}',
130135
f'--key={self._tls_key_path}',
131136
stdout=os.path.abspath(os.path.join(self._log_root, f'gcp-server-{port}-stdout.txt')),
132-
stderr=os.path.abspath(os.path.join(self._log_root, f'gcp-server-{port}-stderr.txt'))
137+
stderr=os.path.abspath(os.path.join(self._log_root, f'gcp-server-{port}-stderr.txt')),
138+
cwd=self._cwd,
133139
)
134140

135141
@keyword
@@ -150,7 +156,8 @@ def create_okta_web_service(
150156
f'--cert={self._tls_cert_path}',
151157
f'--key={self._tls_key_path}',
152158
stdout=os.path.abspath(os.path.join(self._log_root, f'okta-server-{port}-stdout.txt')),
153-
stderr=os.path.abspath(os.path.join(self._log_root, f'okta-server-{port}-stderr.txt'))
159+
stderr=os.path.abspath(os.path.join(self._log_root, f'okta-server-{port}-stderr.txt')),
160+
cwd=self._cwd,
154161
)
155162

156163
@keyword
@@ -171,7 +178,8 @@ def create_aws_web_service(
171178
f'--cert={self._tls_cert_path}',
172179
f'--key={self._tls_key_path}',
173180
stdout=os.path.abspath(os.path.join(self._log_root, f'aws-server-{port}-stdout.txt')),
174-
stderr=os.path.abspath(os.path.join(self._log_root, f'aws-server-{port}-stderr.txt'))
181+
stderr=os.path.abspath(os.path.join(self._log_root, f'aws-server-{port}-stderr.txt')),
182+
cwd=self._cwd,
175183
)
176184

177185
@keyword
@@ -192,7 +200,8 @@ def create_static_auth_web_service(
192200
f'--cert={self._tls_cert_path}',
193201
f'--key={self._tls_key_path}',
194202
stdout=os.path.abspath(os.path.join(self._log_root, f'static-auth-server-{port}-stdout.txt')),
195-
stderr=os.path.abspath(os.path.join(self._log_root, f'static-auth-server-{port}-stderr.txt'))
203+
stderr=os.path.abspath(os.path.join(self._log_root, f'static-auth-server-{port}-stderr.txt')),
204+
cwd=self._cwd,
196205
)
197206

198207
@keyword
@@ -213,7 +222,8 @@ def create_google_admin_web_service(
213222
f'--cert={self._tls_cert_path}',
214223
f'--key={self._tls_key_path}',
215224
stdout=os.path.abspath(os.path.join(self._log_root, f'google-admin-server-{port}-stdout.txt')),
216-
stderr=os.path.abspath(os.path.join(self._log_root, f'google-admin-server-{port}-stderr.txt'))
225+
stderr=os.path.abspath(os.path.join(self._log_root, f'google-admin-server-{port}-stderr.txt')),
226+
cwd=self._cwd,
217227
)
218228

219229
@keyword
@@ -234,7 +244,8 @@ def create_k8s_web_service(
234244
f'--cert={self._tls_cert_path}',
235245
f'--key={self._tls_key_path}',
236246
stdout=os.path.abspath(os.path.join(self._log_root, f'k8s-server-{port}-stdout.txt')),
237-
stderr=os.path.abspath(os.path.join(self._log_root, f'k8s-server-{port}-stderr.txt'))
247+
stderr=os.path.abspath(os.path.join(self._log_root, f'k8s-server-{port}-stderr.txt')),
248+
cwd=self._cwd,
238249
)
239250

240251
@keyword
@@ -255,7 +266,8 @@ def create_registry_web_service(
255266
# f'--cert={self._tls_cert_path}',
256267
# f'--key={self._tls_key_path}',
257268
stdout=os.path.abspath(os.path.join(self._log_root, f'registry-server-{port}-stdout.txt')),
258-
stderr=os.path.abspath(os.path.join(self._log_root, f'registry-server-{port}-stderr.txt'))
269+
stderr=os.path.abspath(os.path.join(self._log_root, f'registry-server-{port}-stderr.txt')),
270+
cwd=self._cwd,
259271
)
260272

261273
@keyword
@@ -276,7 +288,8 @@ def create_azure_web_service(
276288
f'--cert={self._tls_cert_path}',
277289
f'--key={self._tls_key_path}',
278290
stdout=os.path.abspath(os.path.join(self._log_root, f'azure-server-{port}-stdout.txt')),
279-
stderr=os.path.abspath(os.path.join(self._log_root, f'azure-server-{port}-stderr.txt'))
291+
stderr=os.path.abspath(os.path.join(self._log_root, f'azure-server-{port}-stderr.txt')),
292+
cwd=self._cwd,
280293
)
281294

282295
@keyword
@@ -297,7 +310,8 @@ def create_sumologic_web_service(
297310
f'--cert={self._tls_cert_path}',
298311
f'--key={self._tls_key_path}',
299312
stdout=os.path.abspath(os.path.join(self._log_root, f'sumologic-server-{port}-stdout.txt')),
300-
stderr=os.path.abspath(os.path.join(self._log_root, f'sumologic-server-{port}-stderr.txt'))
313+
stderr=os.path.abspath(os.path.join(self._log_root, f'sumologic-server-{port}-stderr.txt')),
314+
cwd=self._cwd,
301315
)
302316

303317
@keyword
@@ -318,7 +332,8 @@ def create_digitalocean_web_service(
318332
f'--cert={self._tls_cert_path}',
319333
f'--key={self._tls_key_path}',
320334
stdout=os.path.abspath(os.path.join(self._log_root, f'digitalocean-server-{port}-stdout.txt')),
321-
stderr=os.path.abspath(os.path.join(self._log_root, f'digitalocean-server-{port}-stderr.txt'))
335+
stderr=os.path.abspath(os.path.join(self._log_root, f'digitalocean-server-{port}-stderr.txt')),
336+
cwd=self._cwd,
322337
)
323338

324339
@keyword

0 commit comments

Comments
 (0)