diff options
| author | Sergio Bertolín <sbertolin@solidgear.es> | 2016-08-26 07:57:48 +0000 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2016-08-30 17:23:26 +0200 |
| commit | 7106129baac765c7296ccebf70910a83058ae3d7 (patch) | |
| tree | 2ad6f1af0623716d96de37eb7383497948223a75 /build | |
| parent | 3a5d29fb59c3b96b80b4fd5e2776f998020a1abc (diff) | |
| download | nextcloud-server-7106129baac765c7296ccebf70910a83058ae3d7.tar.gz nextcloud-server-7106129baac765c7296ccebf70910a83058ae3d7.zip | |
External storage was not enabled and content was not deleted before scenarios
Diffstat (limited to 'build')
| -rw-r--r-- | build/integration/features/bootstrap/BasicStructure.php | 14 | ||||
| -rwxr-xr-x | build/integration/run.sh | 6 |
2 files changed, 19 insertions, 1 deletions
diff --git a/build/integration/features/bootstrap/BasicStructure.php b/build/integration/features/bootstrap/BasicStructure.php index 4330a324ad3..758a2d5d455 100644 --- a/build/integration/features/bootstrap/BasicStructure.php +++ b/build/integration/features/bootstrap/BasicStructure.php @@ -346,9 +346,21 @@ trait BasicStructure { } /** + * @BeforeScenario @local_storage + */ + public static function removeFilesFromLocalStorageBefore(){ + $dir = "./local_storage/"; + $di = new RecursiveDirectoryIterator($dir, FilesystemIterator::SKIP_DOTS); + $ri = new RecursiveIteratorIterator($di, RecursiveIteratorIterator::CHILD_FIRST); + foreach ( $ri as $file ) { + $file->isDir() ? rmdir($file) : unlink($file); + } + } + + /** * @AfterScenario @local_storage */ - public static function removeFilesFromLocalStorage(){ + public static function removeFilesFromLocalStorageAfter(){ $dir = "./local_storage/"; $di = new RecursiveDirectoryIterator($dir, FilesystemIterator::SKIP_DOTS); $ri = new RecursiveIteratorIterator($di, RecursiveIteratorIterator::CHILD_FIRST); diff --git a/build/integration/run.sh b/build/integration/run.sh index 671ca7b9578..69190f7a31d 100755 --- a/build/integration/run.sh +++ b/build/integration/run.sh @@ -36,6 +36,9 @@ echo $PHPPID_FED export TEST_SERVER_URL="http://localhost:$PORT/ocs/" export TEST_SERVER_FED_URL="http://localhost:$PORT_FED/ocs/" +#Enable external storage app +../../occ app:enable files_external + OUTPUT_CREATE_STORAGE=`../../occ files_external:create local_storage local null::null -c datadir=./build/integration/local_storage` ID_STORAGE=`echo $OUTPUT_CREATE_STORAGE | awk {'print $5'}` @@ -50,6 +53,9 @@ kill $PHPPID_FED ../../occ files_external:delete -y $ID_STORAGE +#Disable external storage app +../../occ app:disable files_external + if [ -z $HIDE_OC_LOGS ]; then tail "../../data/nextcloud.log" fi |