Skip to content

Commit 9d222c0

Browse files
Merge pull request #56999 from nextcloud/bugfix/noid/disable-old-cert-test
[stable24] test: Disable old cert test
2 parents 7d0f346 + fd90ed1 commit 9d222c0

File tree

3 files changed

+47
-5
lines changed

3 files changed

+47
-5
lines changed

.drone.yml

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,7 @@ steps:
553553
- name: integration-capabilities_features
554554
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
555555
commands:
556+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
556557
- bash tests/drone-run-integration-tests.sh || exit 0
557558
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
558559
- cd build/integration
@@ -578,6 +579,7 @@ steps:
578579
- name: integration-collaboration_features
579580
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
580581
commands:
582+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
581583
- bash tests/drone-run-integration-tests.sh || exit 0
582584
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
583585
- cd build/integration
@@ -603,6 +605,7 @@ steps:
603605
- name: integration-federation_features
604606
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
605607
commands:
608+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
606609
- bash tests/drone-run-integration-tests.sh || exit 0
607610
- ./occ maintenance:install --admin-pass=admin
608611
- cd build/integration
@@ -628,6 +631,7 @@ steps:
628631
- name: integration-auth
629632
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
630633
commands:
634+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
631635
- bash tests/drone-run-integration-tests.sh || exit 0
632636
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
633637
- cd build/integration
@@ -653,6 +657,7 @@ steps:
653657
- name: integration-avatar
654658
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
655659
commands:
660+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
656661
- bash tests/drone-run-integration-tests.sh || exit 0
657662
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
658663
- cd build/integration
@@ -678,6 +683,7 @@ steps:
678683
- name: integration-maintenance-mode
679684
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
680685
commands:
686+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
681687
- bash tests/drone-run-integration-tests.sh || exit 0
682688
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
683689
- cd build/integration
@@ -703,6 +709,7 @@ steps:
703709
- name: integration-ratelimiting
704710
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
705711
commands:
712+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
706713
- bash tests/drone-run-integration-tests.sh || exit 0
707714
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
708715
- ./occ config:system:set redis host --value=cache
@@ -738,6 +745,7 @@ steps:
738745
- name: integration-carddav
739746
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
740747
commands:
748+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
741749
- bash tests/drone-run-integration-tests.sh || exit 0
742750
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
743751
- cd build/integration
@@ -763,6 +771,7 @@ steps:
763771
- name: integration-dav-v2
764772
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
765773
commands:
774+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
766775
- bash tests/drone-run-integration-tests.sh || exit 0
767776
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
768777
- cd build/integration
@@ -788,6 +797,7 @@ steps:
788797
- name: integration-ocs-v1
789798
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
790799
commands:
800+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
791801
- bash tests/drone-run-integration-tests.sh || exit 0
792802
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
793803
- cd build/integration
@@ -813,6 +823,7 @@ steps:
813823
- name: integration-checksums-v1
814824
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
815825
commands:
826+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
816827
- bash tests/drone-run-integration-tests.sh || exit 0
817828
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
818829
- cd build/integration
@@ -838,6 +849,7 @@ steps:
838849
- name: integration-external-storage
839850
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
840851
commands:
852+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
841853
- bash tests/drone-run-integration-tests.sh || exit 0
842854
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
843855
- cd build/integration
@@ -863,6 +875,7 @@ steps:
863875
- name: integration-provisioning-v1
864876
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
865877
commands:
878+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
866879
- bash tests/drone-run-integration-tests.sh || exit 0
867880
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
868881
- cd build/integration
@@ -888,6 +901,7 @@ steps:
888901
- name: integration-tags
889902
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
890903
commands:
904+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
891905
- bash tests/drone-run-integration-tests.sh || exit 0
892906
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
893907
- cd build/integration
@@ -913,6 +927,7 @@ steps:
913927
- name: integration-caldav
914928
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
915929
commands:
930+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
916931
- bash tests/drone-run-integration-tests.sh || exit 0
917932
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
918933
- cd build/integration
@@ -938,6 +953,7 @@ steps:
938953
- name: integration-comments
939954
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
940955
commands:
956+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
941957
- bash tests/drone-run-integration-tests.sh || exit 0
942958
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
943959
- cd build/integration
@@ -963,6 +979,7 @@ steps:
963979
- name: integration-comments-search
964980
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
965981
commands:
982+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
966983
- bash tests/drone-run-integration-tests.sh || exit 0
967984
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
968985
- cd build/integration
@@ -988,6 +1005,7 @@ steps:
9881005
- name: integration-contacts-menu
9891006
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
9901007
commands:
1008+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
9911009
- bash tests/drone-run-integration-tests.sh || exit 0
9921010
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
9931011
- cd build/integration
@@ -1013,6 +1031,7 @@ steps:
10131031
- name: integration-favorites
10141032
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
10151033
commands:
1034+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
10161035
- bash tests/drone-run-integration-tests.sh || exit 0
10171036
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
10181037
- cd build/integration
@@ -1038,6 +1057,7 @@ steps:
10381057
- name: integration-provisioning-v2
10391058
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
10401059
commands:
1060+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
10411061
- bash tests/drone-run-integration-tests.sh || exit 0
10421062
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
10431063
- cd build/integration
@@ -1063,6 +1083,7 @@ steps:
10631083
- name: integration-webdav-related
10641084
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
10651085
commands:
1086+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
10661087
- bash tests/drone-run-integration-tests.sh || exit 0
10671088
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
10681089
- cd build/integration
@@ -1088,6 +1109,7 @@ steps:
10881109
- name: integration-sharees-features
10891110
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
10901111
commands:
1112+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
10911113
- bash tests/drone-run-integration-tests.sh || exit 0
10921114
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
10931115
- cd build/integration
@@ -1113,6 +1135,7 @@ steps:
11131135
- name: integration-sharees-v2-features
11141136
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
11151137
commands:
1138+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
11161139
- bash tests/drone-run-integration-tests.sh || exit 0
11171140
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
11181141
- cd build/integration
@@ -1138,6 +1161,7 @@ steps:
11381161
- name: integration-sharing-v1
11391162
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
11401163
commands:
1164+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
11411165
- bash tests/drone-run-integration-tests.sh || exit 0
11421166
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
11431167
- cd build/integration
@@ -1163,6 +1187,7 @@ steps:
11631187
- name: integration-sharing-v1-part2
11641188
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
11651189
commands:
1190+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
11661191
- bash tests/drone-run-integration-tests.sh || exit 0
11671192
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
11681193
- cd build/integration
@@ -1188,6 +1213,7 @@ steps:
11881213
- name: integration-sharing-v1-part3
11891214
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
11901215
commands:
1216+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
11911217
- bash tests/drone-run-integration-tests.sh || exit 0
11921218
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
11931219
- cd build/integration
@@ -1219,6 +1245,7 @@ steps:
12191245
- name: integration-sharing-v1-video-verification
12201246
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
12211247
commands:
1248+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
12221249
- bash tests/drone-run-integration-tests.sh || exit 0
12231250
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
12241251
- cd build/integration
@@ -1244,6 +1271,7 @@ steps:
12441271
- name: integration-setup-features
12451272
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
12461273
commands:
1274+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
12471275
- bash tests/drone-run-integration-tests.sh || exit 0
12481276
- cd build/integration
12491277
- ./run.sh setup_features/setup.feature
@@ -1268,6 +1296,7 @@ steps:
12681296
- name: integration-filesdrop-features
12691297
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
12701298
commands:
1299+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
12711300
- bash tests/drone-run-integration-tests.sh || exit 0
12721301
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
12731302
- cd build/integration
@@ -1293,6 +1322,7 @@ steps:
12931322
- name: integration-transfer-ownership-features
12941323
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
12951324
commands:
1325+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
12961326
- bash tests/drone-run-integration-tests.sh || exit 0
12971327
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
12981328
- cd build/integration
@@ -1318,6 +1348,7 @@ steps:
13181348
- name: integration-ldap-features
13191349
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
13201350
commands:
1351+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
13211352
- bash tests/drone-run-integration-tests.sh || exit 0
13221353
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
13231354
- cd build/integration
@@ -1343,6 +1374,7 @@ steps:
13431374
- name: integration-ldap-openldap-features
13441375
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
13451376
commands:
1377+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
13461378
- bash tests/drone-run-integration-tests.sh || exit 0
13471379
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
13481380
- ./occ config:system:set redis host --value=cache
@@ -1384,6 +1416,7 @@ steps:
13841416
- name: integration-ldap-openldap-uid-features
13851417
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
13861418
commands:
1419+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
13871420
- bash tests/drone-run-integration-tests.sh || exit 0
13881421
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
13891422
- ./occ config:system:set redis host --value=cache
@@ -1426,6 +1459,7 @@ steps:
14261459
- name: integration-ldap-openldap-numerical-id-features
14271460
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
14281461
commands:
1462+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
14291463
- bash tests/drone-run-integration-tests.sh || exit 0
14301464
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
14311465
- ./occ config:system:set redis host --value=cache
@@ -1467,6 +1501,7 @@ steps:
14671501
- name: integration-trashbin
14681502
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
14691503
commands:
1504+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
14701505
- bash tests/drone-run-integration-tests.sh || exit 0
14711506
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
14721507
- cd build/integration
@@ -1492,6 +1527,7 @@ steps:
14921527
- name: integration-remote-api
14931528
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
14941529
commands:
1530+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
14951531
- bash tests/drone-run-integration-tests.sh || exit 0
14961532
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
14971533
- cd build/integration
@@ -1517,6 +1553,7 @@ steps:
15171553
- name: integration-download
15181554
image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest
15191555
commands:
1556+
- curl -O -L https://getcomposer.org/download/2.9.2/composer.phar && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
15201557
- bash tests/drone-run-integration-tests.sh || exit 0
15211558
- ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
15221559
- cd build/integration
@@ -1997,4 +2034,6 @@ trigger:
19972034
- push
19982035
---
19992036
kind: signature
2000-
hmac: cf4a43148731e2cbb73e87b7033e1c4aed5ddcda7ee433c6e3d72f07cb59964e
2037+
hmac: 0c4d3ce2e129d533e7f69584b295db9d7e3fbf3324e96499f85fa68197b8da61
2038+
2039+
...

.github/workflows/node-tests.yml

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

4747
- name: Install dependencies
48+
env:
49+
CYPRESS_INSTALL_BINARY: 0
50+
PUPPETEER_SKIP_DOWNLOAD: true
4851
run: npm ci
4952

5053
- 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)