Merge pull request #13922 from owncloud/smb-autotest-external

[files_external] add SMB autotest

apps/files_external/tests/backends/smb.php

@@ -16,12 +16,12 @@ class SMB extends Storage {
 		parent::setUp();
 
 		$id = $this->getUniqueID();
-		$this->config = include('files_external/tests/config.php');
+		$config = include('files_external/tests/config.smb.php');
-		if (!is_array($this->config) or !isset($this->config['smb']) or !$this->config['smb']['run']) {
+		if (!is_array($config) or !$config['run']) {
 			$this->markTestSkipped('Samba backend not configured');
 		}
-		$this->config['smb']['root'] .= $id; //make sure we have an new empty folder to work in
+		$config['root'] .= $id; //make sure we have an new empty folder to work in
-		$this->instance = new \OC\Files\Storage\SMB($this->config['smb']);
+		$this->instance = new \OC\Files\Storage\SMB($config);
 		$this->instance->mkdir('/');
 	}
 

apps/files_external/tests/env/start-smb-silvershell.sh

@@ -0,0 +1,63 @@
+#!/bin/bash
+#
+# ownCloud
+#
+# This script start a docker container to test the files_external tests
+# against. It will also change the files_external config to use the docker
+# container as testing environment. This is reverted in the stop step.W
+#
+# Set environment variable DEBUG to print config file
+#
+# @author Morris Jobke
+# @copyright 2015 Morris Jobke <hey@morrisjobke.de>
+#
+
+if ! command -v docker >/dev/null 2>&1; then
+    echo "No docker executable found - skipped docker setup"
+    exit 0;
+fi
+
+echo "Docker executable found - setup docker"
+
+echo "Fetch recent silvershell/samba docker image"
+docker pull silvershell/samba
+
+# retrieve current folder to place the config in the parent folder
+thisFolder=`echo $0 | replace "env/start-smb-silvershell.sh" ""`
+
+if [ -z "$thisFolder" ]; then
+    thisFolder="."
+fi;
+
+container=`docker run -d -e SMB_USER=test -e SMB_PWD=test silvershell/samba`
+
+host=`docker inspect $container | grep IPAddress | cut -d '"' -f 4`
+
+cat > $thisFolder/config.smb.php <<DELIM
+<?php
+
+return array(
+    'run'=>true,
+    'host'=>'$host',
+    'user'=>'test',
+    'password'=>'test',
+    'root'=>'',
+    'share'=>'public',
+);
+
+DELIM
+
+echo "samba container: $container"
+
+# put container IDs into a file to drop them after the test run (keep in mind that multiple tests run in parallel on the same host)
+echo $container >> $thisFolder/dockerContainerSilvershell.$EXECUTOR_NUMBER.smb
+
+if [ -n "$DEBUG" ]; then
+    cat $thisFolder/config.smb.php
+    cat $thisFolder/dockerContainerSilvershell.$EXECUTOR_NUMBER.smb
+fi
+
+# TODO find a way to determine the successful initialization inside the docker container
+echo "Waiting 5 seconds for smbd initialization ... "
+sleep 5
+

apps/files_external/tests/env/start-webdav-ownCloud.sh

@@ -28,6 +28,10 @@ docker pull morrisjobke/owncloud
 # retrieve current folder to place the config in the parent folder
 thisFolder=`echo $0 | replace "env/start-webdav-ownCloud.sh" ""`
 
+if [ -z "$thisFolder" ]; then
+    thisFolder="."
+fi;
+
 if [ -n "$RUN_DOCKER_MYSQL" ]; then
     echo "Fetch recent mysql docker image"
     docker pull mysql
@@ -78,5 +82,6 @@ if [ -n "$databaseContainer" ]; then
 fi
 
 if [ -n "$DEBUG" ]; then
-    echo $thisFolder/config.webdav.php
+    cat $thisFolder/config.webdav.php
+    cat $thisFolder/dockerContainerOwnCloud.$EXECUTOR_NUMBER.webdav
 fi

apps/files_external/tests/env/stop-smb-silvershell.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+#
+# ownCloud
+#
+# This script stops the docker container the files_external tests were run
+# against. It will also revert the config changes done in start step.
+#
+# @author Morris Jobke
+# @copyright 2015 Morris Jobke <hey@morrisjobke.de>
+#
+
+if ! command -v docker >/dev/null 2>&1; then
+    echo "No docker executable found - skipped docker stop"
+    exit 0;
+fi
+
+echo "Docker executable found - stop and remove docker containers"
+
+# retrieve current folder to remove the config from the parent folder
+thisFolder=`echo $0 | replace "env/stop-smb-silvershell.sh" ""`
+
+if [ -z "$thisFolder" ]; then
+    thisFolder="."
+fi;
+
+# stopping and removing docker containers
+for container in `cat $thisFolder/dockerContainerSilvershell.$EXECUTOR_NUMBER.smb`; do
+    echo "Stopping and removing docker container $container"
+    # kills running container and removes it
+    docker rm -f $container
+done;
+
+# cleanup
+rm $thisFolder/config.smb.php
+rm $thisFolder/dockerContainerSilvershell.$EXECUTOR_NUMBER.smb
+

apps/files_external/tests/env/stop-webdav-ownCloud.sh

@@ -19,14 +19,9 @@ echo "Docker executable found - stop and remove docker containers"
 # retrieve current folder to remove the config from the parent folder
 thisFolder=`echo $0 | replace "env/stop-webdav-ownCloud.sh" ""`
 
-echo "DEBUG"
+if [ -z "$thisFolder" ]; then
-
+    thisFolder="."
-netstat -tlpen
+fi;
-
-echo "CONFIG:"
-
-cat $thisFolder/config.webdav.php
-cat $thisFolder/dockerContainerOwnCloud.$EXECUTOR_NUMBER.webdav
 
 # stopping and removing docker containers
 for container in `cat $thisFolder/dockerContainerOwnCloud.$EXECUTOR_NUMBER.webdav`; do