aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCôme Chilliet <come.chilliet@nextcloud.com>2023-01-24 18:12:32 +0100
committerCôme Chilliet <come.chilliet@nextcloud.com>2023-02-07 11:23:33 +0100
commit892e6c642a5bc44d53375e3144f1a29a8e81ddd5 (patch)
tree0fbe479e08385983ee2efa0ec80308f36ef6e93c
parent885e54e7e0e00b268c597962107439820c95d188 (diff)
downloadnextcloud-server-892e6c642a5bc44d53375e3144f1a29a8e81ddd5.tar.gz
nextcloud-server-892e6c642a5bc44d53375e3144f1a29a8e81ddd5.zip
Skip buggy tests for 32bits CI
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
-rw-r--r--.github/workflows/phpunit-32bits.yml2
-rw-r--r--apps/files_sharing/tests/ApiTest.php19
-rw-r--r--tests/lib/Route/RouterTest.php2
3 files changed, 18 insertions, 5 deletions
diff --git a/.github/workflows/phpunit-32bits.yml b/.github/workflows/phpunit-32bits.yml
index 763043082c8..78be0120cf1 100644
--- a/.github/workflows/phpunit-32bits.yml
+++ b/.github/workflows/phpunit-32bits.yml
@@ -52,4 +52,4 @@ jobs:
- name: PHPUnit
working-directory: tests
- run: phpunit --configuration phpunit-autotest.xml --exclude-group PRIMARY-azure,PRIMARY-s3,PRIMARY-swift,Memcached,Redis
+ run: phpunit --configuration phpunit-autotest.xml --exclude-group PRIMARY-azure,PRIMARY-s3,PRIMARY-swift,Memcached,Redis,RoutingWeirdness
diff --git a/apps/files_sharing/tests/ApiTest.php b/apps/files_sharing/tests/ApiTest.php
index 4d7389be24e..d7661297e9e 100644
--- a/apps/files_sharing/tests/ApiTest.php
+++ b/apps/files_sharing/tests/ApiTest.php
@@ -205,6 +205,9 @@ class ApiTest extends TestCase {
$ocs->cleanup();
}
+ /**
+ * @group RoutingWeirdness
+ */
public function testCreateShareLink() {
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER1);
$result = $ocs->createShare($this->folder, \OCP\Constants::PERMISSION_ALL, IShare::TYPE_LINK);
@@ -227,6 +230,9 @@ class ApiTest extends TestCase {
$ocs->cleanup();
}
+ /**
+ * @group RoutingWeirdness
+ */
public function testCreateShareLinkPublicUpload() {
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER1);
$result = $ocs->createShare($this->folder, \OCP\Constants::PERMISSION_ALL, IShare::TYPE_LINK, null, 'true');
@@ -419,6 +425,7 @@ class ApiTest extends TestCase {
/**
* @medium
+ * @group RoutingWeirdness
*/
public function testPublicLinkUrl() {
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER1);
@@ -837,7 +844,7 @@ class ApiTest extends TestCase {
// $request = $this->createRequest(['path' => $this->subfolder]);
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2);
- $result1 = $ocs->getShares('false','false','false', $this->subfolder);
+ $result1 = $ocs->getShares('false', 'false', 'false', $this->subfolder);
$ocs->cleanup();
// test should return one share within $this->folder
@@ -1050,10 +1057,10 @@ class ApiTest extends TestCase {
$config->setAppValue('core', 'shareapi_enforce_expire_date', 'yes');
$dateWithinRange = new \DateTime();
- $dateWithinRange->setTime(0,0,0);
+ $dateWithinRange->setTime(0, 0, 0);
$dateWithinRange->add(new \DateInterval('P5D'));
$dateOutOfRange = new \DateTime();
- $dateOutOfRange->setTime(0,0,0);
+ $dateOutOfRange->setTime(0, 0, 0);
$dateOutOfRange->add(new \DateInterval('P8D'));
// update expire date to a valid value
@@ -1290,6 +1297,7 @@ class ApiTest extends TestCase {
* Make sure only ISO 8601 dates are accepted
*
* @dataProvider datesProvider
+ * @group RoutingWeirdness
*/
public function testPublicLinkExpireDate($date, $valid) {
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER1);
@@ -1320,6 +1328,9 @@ class ApiTest extends TestCase {
$this->shareManager->deleteShare($share);
}
+ /**
+ * @group RoutingWeirdness
+ */
public function testCreatePublicLinkExpireDateValid() {
$config = \OC::$server->getConfig();
@@ -1343,7 +1354,7 @@ class ApiTest extends TestCase {
$this->assertEquals($url, $data['url']);
$share = $this->shareManager->getShareById('ocinternal:'.$data['id']);
- $date->setTime(0,0,0);
+ $date->setTime(0, 0, 0);
$this->assertEquals($date, $share->getExpirationDate());
$this->shareManager->deleteShare($share);
diff --git a/tests/lib/Route/RouterTest.php b/tests/lib/Route/RouterTest.php
index e67c4518cb0..44fef6f1d4f 100644
--- a/tests/lib/Route/RouterTest.php
+++ b/tests/lib/Route/RouterTest.php
@@ -30,6 +30,8 @@ use Test\TestCase;
/**
* Class RouterTest
*
+ * @group RoutingWeirdness
+ *
* @package Test\Route
*/
class RouterTest extends TestCase {