tests(integration): Fix catching error only on object store

Signed-off-by: Julius Härtl <jus@bitgrid.net>

diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php
index 00ba5c288625d3b23f511fc90f4dbea15ff519ea..9c81a5817b4b0cb41b97a0a9074af64a74957ca4 100644 (file)
--- a/build/integration/features/bootstrap/WebDav.php
+++ b/build/integration/features/bootstrap/WebDav.php
@@ -1078,4 +1078,20 @@ trait WebDav {
        public function theSmultipartUploadWasSuccessful($status) {
                Assert::assertEquals((int)$status, $this->response->getStatusCode());
        }
+
+       /**
+        * @Then /^the upload should fail on object storage$/
+        */
+       public function theUploadShouldFailOnObjectStorage() {
+               $descriptor = [
+                       0 => ['pipe', 'r'],
+                       1 => ['pipe', 'w'],
+                       2 => ['pipe', 'w'],
+               ];
+               $process = proc_open('php occ config:system:get objectstore --no-ansi', $descriptor, $pipes, '../../');
+               $lastCode = proc_close($process);
+               if ($lastCode === 0) {
+                       $this->theHTTPStatusCodeShouldBe(500);
+               }
+       }
 }

diff --git a/build/integration/features/webdav-related.feature b/build/integration/features/webdav-related.feature
index f63ee24527f9a7dcaf028953cc9b743974892c6e..28a0cad619b46594503abd450f9fc81e4b73f971 100644 (file)
--- a/build/integration/features/webdav-related.feature
+++ b/build/integration/features/webdav-related.feature
@@ -694,7 +694,7 @@ Feature: webdav-related
                And user "user0" uploads new chunk v2 file "2" to id "chunking-random"
                And user "user0" uploads new chunk v2 file "4" to id "chunking-random"
                And user "user0" moves new chunk v2 file with id "chunking-random"
-               Then the HTTP status code should be "500"
+    Then the upload should fail on object storage
 
        @s3-multipart
        Scenario: Upload chunked file with special characters with new chunking v2