summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorSergio BertolĂ­n <sbertolin@solidgear.es>2016-08-30 10:53:19 +0000
committerLukas Reschke <lukas@statuscode.ch>2016-08-30 17:23:56 +0200
commit81c18f5aa789260d7d0091d133125a018d62547a (patch)
tree8fac0968b2edd85b7018bdaee00cf892c8529450 /build
parent86cfcde5e990fdd165f24d1b11abd43a5b391595 (diff)
downloadnextcloud-server-81c18f5aa789260d7d0091d133125a018d62547a.tar.gz
nextcloud-server-81c18f5aa789260d7d0091d133125a018d62547a.zip
Creating the folder when the tests run
Diffstat (limited to 'build')
-rw-r--r--build/integration/features/bootstrap/BasicStructure.php4
-rw-r--r--build/integration/local_storage/.gitignore4
-rwxr-xr-xbuild/integration/run.sh3
3 files changed, 4 insertions, 7 deletions
diff --git a/build/integration/features/bootstrap/BasicStructure.php b/build/integration/features/bootstrap/BasicStructure.php
index 758a2d5d455..e6da74601ba 100644
--- a/build/integration/features/bootstrap/BasicStructure.php
+++ b/build/integration/features/bootstrap/BasicStructure.php
@@ -349,7 +349,7 @@ trait BasicStructure {
* @BeforeScenario @local_storage
*/
public static function removeFilesFromLocalStorageBefore(){
- $dir = "./local_storage/";
+ $dir = "./work/local_storage/";
$di = new RecursiveDirectoryIterator($dir, FilesystemIterator::SKIP_DOTS);
$ri = new RecursiveIteratorIterator($di, RecursiveIteratorIterator::CHILD_FIRST);
foreach ( $ri as $file ) {
@@ -361,7 +361,7 @@ trait BasicStructure {
* @AfterScenario @local_storage
*/
public static function removeFilesFromLocalStorageAfter(){
- $dir = "./local_storage/";
+ $dir = "./work/local_storage/";
$di = new RecursiveDirectoryIterator($dir, FilesystemIterator::SKIP_DOTS);
$ri = new RecursiveIteratorIterator($di, RecursiveIteratorIterator::CHILD_FIRST);
foreach ( $ri as $file ) {
diff --git a/build/integration/local_storage/.gitignore b/build/integration/local_storage/.gitignore
deleted file mode 100644
index 5e7d2734cfc..00000000000
--- a/build/integration/local_storage/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
diff --git a/build/integration/run.sh b/build/integration/run.sh
index 69190f7a31d..cf42ed75e4c 100755
--- a/build/integration/run.sh
+++ b/build/integration/run.sh
@@ -39,7 +39,8 @@ 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`
+mkdir -p work/local_storage
+OUTPUT_CREATE_STORAGE=`../../occ files_external:create local_storage local null::null -c datadir=./build/integration/work/local_storage`
ID_STORAGE=`echo $OUTPUT_CREATE_STORAGE | awk {'print $5'}`