Skip to content

Commit f5b19e9

Browse files
anon-pradipanon-pradip
committed
test: rebase
1 parent 69eafa2 commit f5b19e9

File tree

4 files changed

+67
-53
lines changed

4 files changed

+67
-53
lines changed

‎.drone.star‎

Lines changed: 40 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -85,21 +85,21 @@ S3_PUBLIC_CACHE_BUCKET = "public"
8585
# configuration
8686
config = {
8787
"cs3ApiTests": {
88-
"skip": False,
88+
"skip": True,
8989
},
9090
"wopiValidatorTests": {
91-
"skip": False,
91+
"skip": True,
9292
},
9393
"k6LoadTests": {
94-
"skip": False,
94+
"skip": True,
9595
},
9696
"localApiTests": {
9797
"contractAndLock": {
9898
"suites": [
9999
"apiContract",
100100
"apiLocks",
101101
],
102-
"skip": False,
102+
"skip": True,
103103
"k8s": True,
104104
},
105105
"settingsAndNotification": {
@@ -108,7 +108,7 @@ config = {
108108
"apiNotification",
109109
"apiCors",
110110
],
111-
"skip": False,
111+
"skip": True,
112112
"withRemotePhp": [False],
113113
"emailNeeded": True,
114114
"extraEnvironment": {
@@ -128,22 +128,22 @@ config = {
128128
"suites": [
129129
"apiGraphUser",
130130
],
131-
"skip": False,
131+
"skip": True,
132132
"withRemotePhp": [False],
133133
"k8s": True,
134134
},
135135
"spaces": {
136136
"suites": [
137137
"apiSpaces",
138138
],
139-
"skip": False,
139+
"skip": True,
140140
"k8s": True,
141141
},
142142
"spacesShares": {
143143
"suites": [
144144
"apiSpacesShares",
145145
],
146-
"skip": False,
146+
"skip": True,
147147
"k8s": True,
148148
},
149149
"davOperations": {
@@ -155,15 +155,15 @@ config = {
155155
"apiArchiver",
156156
"apiActivities",
157157
],
158-
"skip": False,
158+
"skip": True,
159159
},
160160
"groupAndSearch1": {
161161
"suites": [
162162
"apiSearch1",
163163
"apiGraph",
164164
"apiGraphGroup",
165165
],
166-
"skip": False,
166+
"skip": True,
167167
"k8s": True,
168168
},
169169
"search2": {
@@ -172,7 +172,7 @@ config = {
172172
"apiSearchContent",
173173
],
174174
"tikaNeeded": True,
175-
"skip": False,
175+
"skip": True,
176176
"k8s": True,
177177
},
178178
"sharingNg1": {
@@ -181,15 +181,15 @@ config = {
181181
"apiReshare",
182182
"apiSharingNgPermissions",
183183
],
184-
"skip": False,
184+
"skip": True,
185185
"withRemotePhp": [False],
186186
"k8s": True,
187187
},
188188
"sharingNgAdditionalShareRole": {
189189
"suites": [
190190
"apiSharingNgAdditionalShareRole",
191191
],
192-
"skip": False,
192+
"skip": True,
193193
"k8s": True,
194194
"withRemotePhp": [False],
195195
},
@@ -198,7 +198,7 @@ config = {
198198
"apiSharingNgDriveInvitation",
199199
"apiSharingNgItemInvitation",
200200
],
201-
"skip": False,
201+
"skip": True,
202202
"withRemotePhp": [False],
203203
},
204204
"sharingNgLinkShare": {
@@ -207,15 +207,15 @@ config = {
207207
"apiSharingNgItemLinkShare",
208208
"apiSharingNgLinkShareManagement",
209209
],
210-
"skip": False,
210+
"skip": True,
211211
"k8s": True,
212212
"withRemotePhp": [False],
213213
},
214214
"antivirus": {
215215
"suites": [
216216
"apiAntivirus",
217217
],
218-
"skip": False,
218+
"skip": True,
219219
"k8s": True,
220220
"antivirusNeeded": True,
221221
"extraServerEnvironment": {
@@ -231,7 +231,7 @@ config = {
231231
"apiOcm",
232232
"apiServiceAvailability",
233233
],
234-
"skip": False,
234+
"skip": True,
235235
"withRemotePhp": [False],
236236
"federationServer": True,
237237
"emailNeeded": True,
@@ -257,7 +257,7 @@ config = {
257257
"suites": [
258258
"apiAuthApp",
259259
],
260-
"skip": False,
260+
"skip": True,
261261
"k8s": True,
262262
"withRemotePhp": [False],
263263
"extraServerEnvironment": {
@@ -269,7 +269,7 @@ config = {
269269
"suites": [
270270
"apiCollaboration",
271271
],
272-
"skip": False,
272+
"skip": True,
273273
"withRemotePhp": [False],
274274
"collaborationServiceNeeded": True,
275275
"extraServerEnvironment": {
@@ -280,7 +280,7 @@ config = {
280280
"suites": [
281281
"cliCommands",
282282
],
283-
"skip": False,
283+
"skip": True,
284284
"withRemotePhp": [False],
285285
"antivirusNeeded": True,
286286
"emailNeeded": True,
@@ -309,7 +309,7 @@ config = {
309309
"coreApiMain",
310310
"coreApiVersions",
311311
],
312-
"skip": False,
312+
"skip": True,
313313
"withRemotePhp": [False],
314314
"k8s": True,
315315
},
@@ -318,7 +318,7 @@ config = {
318318
"coreApiShareManagementBasicToShares",
319319
"coreApiShareManagementToShares",
320320
],
321-
"skip": False,
321+
"skip": True,
322322
"k8s": True,
323323
"withRemotePhp": [False],
324324
},
@@ -327,7 +327,7 @@ config = {
327327
"coreApiSharees",
328328
"coreApiSharePublicLink2",
329329
],
330-
"skip": False,
330+
"skip": True,
331331
"withRemotePhp": [False],
332332
"k8s": True,
333333
},
@@ -340,7 +340,7 @@ config = {
340340
"coreApiShareCreateSpecialToShares2",
341341
"coreApiShareUpdateToShares",
342342
],
343-
"skip": False,
343+
"skip": True,
344344
"k8s": True,
345345
"withRemotePhp": [False],
346346
},
@@ -351,7 +351,7 @@ config = {
351351
"coreApiWebdavEtagPropagation1",
352352
"coreApiWebdavEtagPropagation2",
353353
],
354-
"skip": False,
354+
"skip": True,
355355
"k8s": True,
356356
},
357357
"6": {
@@ -360,13 +360,13 @@ config = {
360360
"coreApiWebdavOperations",
361361
"coreApiWebdavMove2",
362362
],
363-
"skip": False,
363+
"skip": True,
364364
},
365365
"7": {
366366
"suites": [
367367
"coreApiWebdavProperties",
368368
],
369-
"skip": False,
369+
"skip": True,
370370
"k8s": True,
371371
},
372372
"8": {
@@ -382,24 +382,24 @@ config = {
382382
},
383383
"e2eTests": {
384384
"part": {
385-
"skip": False,
385+
"skip": True,
386386
"totalParts": 4, # divide and run all suites in parts (divide pipelines)
387387
"xsuites": ["search", "app-provider", "oidc", "ocm", "keycloak"], # suites to skip
388388
},
389389
"search": {
390-
"skip": False,
390+
"skip": True,
391391
"suites": ["search"], # suites to run
392392
"tikaNeeded": True,
393393
},
394394
"keycloak": {
395-
"skip": False,
395+
"skip": True,
396396
"suites": ["journeys", "keycloak"],
397397
"keycloakNeeded": True,
398398
},
399399
},
400400
"e2eMultiService": {
401401
"testSuites": {
402-
"skip": False,
402+
"skip": True,
403403
"suites": [
404404
"smoke",
405405
"shares",
@@ -1407,7 +1407,7 @@ def coreApiTestPipeline(ctx):
14071407
for run_with_remote_php in params["withRemotePhp"]:
14081408
filter_tags = "~@skipOnGraph&&~@skipOnOcis-%s-Storage" % ("OC" if storage == "owncloud" else "OCIS")
14091409
expected_failures_file = "%s/expected-failures-API-on-%s-storage.md" % (test_dir, storage.upper())
1410-
run_on_k8s = params["k8s"] and ctx.build.event == "cron"
1410+
run_on_k8s = params["k8s"]
14111411
ocis_url = OCIS_URL
14121412
if run_on_k8s:
14131413
ocis_url = "https://%s" % OCIS_SERVER_NAME
@@ -3808,11 +3808,6 @@ def k3sCluster():
38083808
"kubectl create configmap coredns-custom -n kube-system " +
38093809
"--from-literal='rewritehost.override=rewrite name exact %s host.k3d.internal'" % OCIS_SERVER_NAME,
38103810
"kubectl -n kube-system rollout restart deployment coredns",
3811-
# Setup Unicode font support for thumbnails - create ConfigMaps
3812-
"kubectl create namespace ocis || true",
3813-
"echo '{\"defaultFont\": \"/etc/ocis/fonts/NotoSans.ttf\"}' > %s/fontsMap.json" % dirs["base"],
3814-
"kubectl create configmap -n ocis ocis-fonts-ttf --from-file=%s/tests/config/drone/NotoSans.ttf" % dirs["base"],
3815-
"kubectl create configmap -n ocis ocis-fonts-map --from-file=%s/fontsMap.json" % dirs["base"],
38163811
# watch events
38173812
"kubectl get events -Aw",
38183813
],
@@ -3849,6 +3844,10 @@ def prepareOcisDeployment():
38493844
"sed -i 's|- name: configs|- name: banned-passwords|' ./charts/ocis/templates/frontend/deployment.yaml",
38503845
"sed -i 's|mountPath: /etc/ocis$|mountPath: /etc/ocis/config/drone|' ./charts/ocis/templates/frontend/deployment.yaml",
38513846
"sed -i 's|name: sharing-banned-passwords-{{ .appName }}|name: sharing-banned-passwords|' ./charts/ocis/templates/frontend/deployment.yaml",
3847+
# Patch thumbnails deployment to mount Unicode fonts (ConfigMaps created in k3sCluster)
3848+
"sed -i '/- name: THUMBNAILS_TRANSFER_TOKEN/i\\\\ - name: THUMBNAILS_TXT_FONTMAP_FILE\\\n value: /etc/ocis/fontsMap.json\\\n' ./charts/ocis/templates/thumbnails/deployment.yaml",
3849+
"sed -i '/volumeMounts:/a\\\\ - name: ocis-fonts-ttf\\\n mountPath: /etc/ocis/fonts\\\n - name: ocis-fonts-map\\\n mountPath: /etc/ocis/fontsMap.json\\\n subPath: fontsMap.json' ./charts/ocis/templates/thumbnails/deployment.yaml",
3850+
"sed -i '/volumes:/a\\\\ - name: ocis-fonts-ttf\\\n configMap:\\\n name: ocis-fonts-ttf\\\n - name: ocis-fonts-map\\\n configMap:\\\n name: ocis-fonts-map' ./charts/ocis/templates/thumbnails/deployment.yaml",
38523851
]
38533852

38543853
return [{
@@ -3869,6 +3868,10 @@ def setupOcisConfigMaps():
38693868
# Create namespace for oCIS deployment
38703869
"kubectl create namespace ocis || true",
38713870
"kubectl create configmap -n ocis sharing-banned-passwords --from-file=banned-password-list.txt=%s/tests/config/drone/banned-password-list.txt" % dirs["base"],
3871+
# Setup Unicode font support for thumbnails - create ConfigMaps
3872+
"echo '{\"defaultFont\": \"/etc/ocis/fonts/NotoSans.ttf\"}' > %s/fontsMap.json" % dirs["base"],
3873+
"kubectl create configmap -n ocis ocis-fonts-ttf --from-file=%s/tests/config/drone/NotoSans.ttf" % dirs["base"],
3874+
"kubectl create configmap -n ocis ocis-fonts-map --from-file=%s/fontsMap.json" % dirs["base"],
38723875
]
38733876

38743877
return [{

‎tests/acceptance/bootstrap/WebDav.php‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4039,8 +4039,19 @@ public function checkImageDimensions(string $width, string $height, ?ResponseInt
40394039
$responseBodyContent = $response->getBody()->getContents();
40404040
$size = \getimagesizefromstring($responseBodyContent);
40414041
Assert::assertNotFalse($size, "could not get size of image");
4042-
Assert::assertEquals($width, $size[0], "width not as expected");
4043-
Assert::assertEquals($height, $size[1], "height not as expected");
4042+
// allow multiple acceptable expected dimensions, comma-separated
4043+
$checkDimension = static function (string $expected, int $actual, string $message): void {
4044+
$expectedParts = array_map('trim', explode(',', $expected));
4045+
$expectedInts = array_map('intval', $expectedParts);
4046+
if (\count($expectedInts) > 1) {
4047+
Assert::assertContainsEquals($actual, $expectedInts, $message);
4048+
} else {
4049+
Assert::assertEquals($expectedInts[0], $actual, $message);
4050+
}
4051+
};
4052+
4053+
$checkDimension($width, $size[0], "width not as expected");
4054+
$checkDimension($height, $size[1], "height not as expected");
40444055
}
40454056

40464057
/**

‎tests/acceptance/features/coreApiWebdavPreviews/previews.feature‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -407,10 +407,10 @@ Feature: previews of files downloaded through the webdav API
407407
@issue-10589 @env-config
408408
Scenario Outline: download a file preview when the maximum thumbnail input value in the environment is set to a valid value
409409
Given the following configs have been set:
410-
| config | value |
411-
| THUMBNAILS_MAX_INPUT_IMAGE_FILE_SIZE | 1KB |
412-
| THUMBNAILS_MAX_INPUT_WIDTH | 700 |
413-
| THUMBNAILS_MAX_INPUT_HEIGHT | 700 |
410+
| service | config | value |
411+
| thumbnails | THUMBNAILS_MAX_INPUT_IMAGE_FILE_SIZE | 1KB |
412+
| thumbnails | THUMBNAILS_MAX_INPUT_WIDTH | 700 |
413+
| thumbnails | THUMBNAILS_MAX_INPUT_HEIGHT | 700 |
414414
And using <dav-path-version> DAV path
415415
And user "Alice" has uploaded file with content "hello world" to "test.txt"
416416
When user "Alice" downloads the preview of "/test.txt" with width "32" and height "32" and processor thumbnail using the WebDAV API
@@ -424,10 +424,10 @@ Feature: previews of files downloaded through the webdav API
424424
@issue-10589 @env-config
425425
Scenario Outline: download an image preview when the maximum thumbnail input value in the environment is set to a valid value
426426
Given the following configs have been set:
427-
| config | value |
428-
| THUMBNAILS_MAX_INPUT_IMAGE_FILE_SIZE | 36KB |
429-
| THUMBNAILS_MAX_INPUT_WIDTH | 1250 |
430-
| THUMBNAILS_MAX_INPUT_HEIGHT | 650 |
427+
| service | config | value |
428+
| thumbnails | THUMBNAILS_MAX_INPUT_IMAGE_FILE_SIZE | 36KB |
429+
| thumbnails | THUMBNAILS_MAX_INPUT_WIDTH | 1250 |
430+
| thumbnails | THUMBNAILS_MAX_INPUT_HEIGHT | 650 |
431431
And using <dav-path-version> DAV path
432432
And user "Alice" has uploaded file "filesForUpload/testavatar.png" to "/testimage.png"
433433
When user "Alice" downloads the preview of "/testimage.png" with width "32" and height "32" and processor thumbnail using the WebDAV API

‎tests/acceptance/features/coreApiWebdavPreviews/previewsAutoAdustedSizing.feature‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ Feature: sizing of previews of files downloaded through the webdav API
2121
| request-width | request-height | return-width | return-height | dav-path-version |
2222
| 1 | 1 | 16 | 16 | old |
2323
| 32 | 32 | 32 | 32 | old |
24-
| 1024 | 1024 | 640 | 480 | old |
24+
| 1024 | 1024 | 640 | 480,640 | old |
2525
| 1 | 1024 | 16 | 16 | old |
26-
| 1024 | 1 | 640 | 480 | old |
26+
| 1024 | 1 | 640 | 480,640 | old |
2727
| 1 | 1 | 16 | 16 | new |
2828
| 32 | 32 | 32 | 32 | new |
29-
| 1024 | 1024 | 640 | 480 | new |
29+
| 1024 | 1024 | 640 | 480,640 | new |
3030
| 1 | 1024 | 16 | 16 | new |
31-
| 1024 | 1 | 640 | 480 | new |
31+
| 1024 | 1 | 640 | 480,640 | new |
3232
| 1 | 1 | 16 | 16 | spaces |
3333
| 32 | 32 | 32 | 32 | spaces |
34-
| 1024 | 1024 | 640 | 480 | spaces |
34+
| 1024 | 1024 | 640 | 480,640 | spaces |
3535
| 1 | 1024 | 16 | 16 | spaces |
36-
| 1024 | 1 | 640 | 480 | spaces |
36+
| 1024 | 1 | 640 | 480,640 | spaces |

0 commit comments

Comments
 (0)