Skip to content

Commit 9f4bb74

Browse files
Merge pull request #57007 from nextcloud/backport/56999/stable23
[stable23] test: Disable old cert test
2 parents abde642 + 8bb54e8 commit 9f4bb74

File tree

3 files changed

+45
-5
lines changed

3 files changed

+45
-5
lines changed

.drone.yml

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -778,6 +778,7 @@ steps:
778778
- name: integration-capabilities_features
779779
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
780780
commands:
781+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
781782
- bash tests/drone-run-integration-tests.sh || exit 0
782783
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
783784
- cd build/integration
@@ -803,6 +804,7 @@ steps:
803804
- name: integration-collaboration_features
804805
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
805806
commands:
807+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
806808
- bash tests/drone-run-integration-tests.sh || exit 0
807809
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
808810
- cd build/integration
@@ -828,6 +830,7 @@ steps:
828830
- name: integration-federation_features
829831
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
830832
commands:
833+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
831834
- bash tests/drone-run-integration-tests.sh || exit 0
832835
- ./occ maintenance:install --admin-pass=admin
833836
- cd build/integration
@@ -853,6 +856,7 @@ steps:
853856
- name: integration-auth
854857
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
855858
commands:
859+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
856860
- bash tests/drone-run-integration-tests.sh || exit 0
857861
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
858862
- cd build/integration
@@ -878,6 +882,7 @@ steps:
878882
- name: integration-avatar
879883
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
880884
commands:
885+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
881886
- bash tests/drone-run-integration-tests.sh || exit 0
882887
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
883888
- cd build/integration
@@ -903,6 +908,7 @@ steps:
903908
- name: integration-maintenance-mode
904909
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
905910
commands:
911+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
906912
- bash tests/drone-run-integration-tests.sh || exit 0
907913
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
908914
- cd build/integration
@@ -928,6 +934,7 @@ steps:
928934
- name: integration-ratelimiting
929935
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
930936
commands:
937+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
931938
- bash tests/drone-run-integration-tests.sh || exit 0
932939
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
933940
- ./occ config:system:set redis host --value=cache
@@ -963,6 +970,7 @@ steps:
963970
- name: integration-carddav
964971
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
965972
commands:
973+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
966974
- bash tests/drone-run-integration-tests.sh || exit 0
967975
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
968976
- cd build/integration
@@ -988,6 +996,7 @@ steps:
988996
- name: integration-dav-v2
989997
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
990998
commands:
999+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
9911000
- bash tests/drone-run-integration-tests.sh || exit 0
9921001
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
9931002
- cd build/integration
@@ -1013,6 +1022,7 @@ steps:
10131022
- name: integration-ocs-v1
10141023
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
10151024
commands:
1025+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
10161026
- bash tests/drone-run-integration-tests.sh || exit 0
10171027
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
10181028
- cd build/integration
@@ -1038,6 +1048,7 @@ steps:
10381048
- name: integration-checksums-v1
10391049
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
10401050
commands:
1051+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
10411052
- bash tests/drone-run-integration-tests.sh || exit 0
10421053
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
10431054
- cd build/integration
@@ -1063,6 +1074,7 @@ steps:
10631074
- name: integration-external-storage
10641075
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
10651076
commands:
1077+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
10661078
- bash tests/drone-run-integration-tests.sh || exit 0
10671079
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
10681080
- cd build/integration
@@ -1088,6 +1100,7 @@ steps:
10881100
- name: integration-provisioning-v1
10891101
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
10901102
commands:
1103+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
10911104
- bash tests/drone-run-integration-tests.sh || exit 0
10921105
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
10931106
- cd build/integration
@@ -1113,6 +1126,7 @@ steps:
11131126
- name: integration-tags
11141127
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
11151128
commands:
1129+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
11161130
- bash tests/drone-run-integration-tests.sh || exit 0
11171131
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
11181132
- cd build/integration
@@ -1138,6 +1152,7 @@ steps:
11381152
- name: integration-caldav
11391153
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
11401154
commands:
1155+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
11411156
- bash tests/drone-run-integration-tests.sh || exit 0
11421157
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
11431158
- cd build/integration
@@ -1163,6 +1178,7 @@ steps:
11631178
- name: integration-comments
11641179
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
11651180
commands:
1181+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
11661182
- bash tests/drone-run-integration-tests.sh || exit 0
11671183
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
11681184
- cd build/integration
@@ -1188,6 +1204,7 @@ steps:
11881204
- name: integration-comments-search
11891205
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
11901206
commands:
1207+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
11911208
- bash tests/drone-run-integration-tests.sh || exit 0
11921209
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
11931210
- cd build/integration
@@ -1213,6 +1230,7 @@ steps:
12131230
- name: integration-contacts-menu
12141231
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
12151232
commands:
1233+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
12161234
- bash tests/drone-run-integration-tests.sh || exit 0
12171235
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
12181236
- cd build/integration
@@ -1238,6 +1256,7 @@ steps:
12381256
- name: integration-favorites
12391257
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
12401258
commands:
1259+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
12411260
- bash tests/drone-run-integration-tests.sh || exit 0
12421261
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
12431262
- cd build/integration
@@ -1263,6 +1282,7 @@ steps:
12631282
- name: integration-provisioning-v2
12641283
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
12651284
commands:
1285+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
12661286
- bash tests/drone-run-integration-tests.sh || exit 0
12671287
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
12681288
- cd build/integration
@@ -1288,6 +1308,7 @@ steps:
12881308
- name: integration-webdav-related
12891309
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
12901310
commands:
1311+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
12911312
- bash tests/drone-run-integration-tests.sh || exit 0
12921313
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
12931314
- cd build/integration
@@ -1313,6 +1334,7 @@ steps:
13131334
- name: integration-sharees-features
13141335
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
13151336
commands:
1337+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
13161338
- bash tests/drone-run-integration-tests.sh || exit 0
13171339
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
13181340
- cd build/integration
@@ -1338,6 +1360,7 @@ steps:
13381360
- name: integration-sharees-v2-features
13391361
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
13401362
commands:
1363+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
13411364
- bash tests/drone-run-integration-tests.sh || exit 0
13421365
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
13431366
- cd build/integration
@@ -1363,6 +1386,7 @@ steps:
13631386
- name: integration-sharing-v1
13641387
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
13651388
commands:
1389+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
13661390
- bash tests/drone-run-integration-tests.sh || exit 0
13671391
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
13681392
- cd build/integration
@@ -1388,6 +1412,7 @@ steps:
13881412
- name: integration-sharing-v1-part2
13891413
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
13901414
commands:
1415+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
13911416
- bash tests/drone-run-integration-tests.sh || exit 0
13921417
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
13931418
- cd build/integration
@@ -1413,6 +1438,7 @@ steps:
14131438
- name: integration-sharing-v1-part3
14141439
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
14151440
commands:
1441+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
14161442
- bash tests/drone-run-integration-tests.sh || exit 0
14171443
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
14181444
- cd build/integration
@@ -1444,6 +1470,7 @@ steps:
14441470
- name: integration-sharing-v1-video-verification
14451471
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
14461472
commands:
1473+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
14471474
- bash tests/drone-run-integration-tests.sh || exit 0
14481475
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
14491476
- cd build/integration
@@ -1469,6 +1496,7 @@ steps:
14691496
- name: integration-setup-features
14701497
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
14711498
commands:
1499+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
14721500
- bash tests/drone-run-integration-tests.sh || exit 0
14731501
- cd build/integration
14741502
- ./run.sh setup_features/setup.feature
@@ -1493,6 +1521,7 @@ steps:
14931521
- name: integration-filesdrop-features
14941522
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
14951523
commands:
1524+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
14961525
- bash tests/drone-run-integration-tests.sh || exit 0
14971526
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
14981527
- cd build/integration
@@ -1518,6 +1547,7 @@ steps:
15181547
- name: integration-transfer-ownership-features
15191548
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
15201549
commands:
1550+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
15211551
- bash tests/drone-run-integration-tests.sh || exit 0
15221552
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
15231553
- cd build/integration
@@ -1543,6 +1573,7 @@ steps:
15431573
- name: integration-ldap-features
15441574
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
15451575
commands:
1576+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
15461577
- bash tests/drone-run-integration-tests.sh || exit 0
15471578
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
15481579
- cd build/integration
@@ -1568,6 +1599,7 @@ steps:
15681599
- name: integration-ldap-openldap-features
15691600
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
15701601
commands:
1602+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
15711603
- bash tests/drone-run-integration-tests.sh || exit 0
15721604
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
15731605
- ./occ config:system:set redis host --value=cache
@@ -1609,6 +1641,7 @@ steps:
16091641
- name: integration-ldap-openldap-uid-features
16101642
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
16111643
commands:
1644+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
16121645
- bash tests/drone-run-integration-tests.sh || exit 0
16131646
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
16141647
- ./occ config:system:set redis host --value=cache
@@ -1651,6 +1684,7 @@ steps:
16511684
- name: integration-ldap-openldap-numerical-id-features
16521685
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
16531686
commands:
1687+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
16541688
- bash tests/drone-run-integration-tests.sh || exit 0
16551689
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
16561690
- ./occ config:system:set redis host --value=cache
@@ -1692,6 +1726,7 @@ steps:
16921726
- name: integration-trashbin
16931727
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
16941728
commands:
1729+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
16951730
- bash tests/drone-run-integration-tests.sh || exit 0
16961731
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
16971732
- cd build/integration
@@ -1717,6 +1752,7 @@ steps:
17171752
- name: integration-remote-api
17181753
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
17191754
commands:
1755+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
17201756
- bash tests/drone-run-integration-tests.sh || exit 0
17211757
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
17221758
- cd build/integration
@@ -1742,6 +1778,7 @@ steps:
17421778
- name: integration-download
17431779
image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest
17441780
commands:
1781+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
17451782
- bash tests/drone-run-integration-tests.sh || exit 0
17461783
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
17471784
- cd build/integration
@@ -2355,6 +2392,6 @@ trigger:
23552392
# - push
23562393
---
23572394
kind: signature
2358-
hmac: f3a025a17ff926af23615f50fada10ecc0c4a2fd5802f5e05566115bd54e4565
2395+
hmac: 964c3515a08e66da50fb2657058eaafbbe88c2a43092b44d4c87f0493356f528
23592396

23602397
...

.github/workflows/node-tests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ jobs:
4242
run: npm i -g npm@"${{ needs.versions.outputs.npmVersion }}"
4343

4444
- name: Install dependencies
45+
env:
46+
CYPRESS_INSTALL_BINARY: 0
47+
PUPPETEER_SKIP_DOWNLOAD: true
4548
run: npm ci
4649

4750
- name: Test

tests/lib/Security/CertificateTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ protected function setUp(): void {
4646
$this->expiredCertificate = new Certificate($expiredCertificate, 'ExpiredCertificate');
4747
}
4848

49-
49+
5050
public function testBogusData() {
5151
$this->expectException(\Exception::class);
5252
$this->expectExceptionMessage('Certificate could not get parsed.');
@@ -55,7 +55,7 @@ public function testBogusData() {
5555
$certificate->getIssueDate();
5656
}
5757

58-
58+
5959
public function testCertificateStartingWithFileReference() {
6060
$this->expectException(\Exception::class);
6161
$this->expectExceptionMessage('Certificate could not get parsed.');
@@ -95,8 +95,8 @@ public function testGetExpireDate() {
9595
}
9696

9797
public function testIsExpired() {
98-
$this->assertSame(false, $this->goodCertificate->isExpired());
99-
$this->assertSame(false, $this->invalidCertificate->isExpired());
98+
// Disabled due to age $this->assertSame(false, $this->goodCertificate->isExpired());
99+
// Disabled due to age $this->assertSame(false, $this->invalidCertificate->isExpired());
100100
$this->assertSame(true, $this->expiredCertificate->isExpired());
101101
}
102102

0 commit comments

Comments
 (0)