Merge pull request #333 from nextcloud/sync-master

Sync master

5 files changed, 95 insertions, 153 deletions

diff --git a/tests/Core/Controller/OccControllerTest.php b/tests/Core/Controller/OccControllerTest.php
deleted file mode 100644
index 682d9170096..00000000000
--- a/tests/Core/Controller/OccControllerTest.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-/**
- * @author Victor Dubiniuk <dubiniuk@owncloud.com>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace Tests\Core\Controller;
-
-use OC\Console\Application;
-use OC\Core\Controller\OccController;
-use OCP\IConfig;
-use Symfony\Component\Console\Output\Output;
-use Test\TestCase;
-
-/**
- * Class OccControllerTest
- *
- * @package OC\Core\Controller
- */
-class OccControllerTest extends TestCase {
-
-	const TEMP_SECRET = 'test';
-
-	/** @var \OC\AppFramework\Http\Request | \PHPUnit_Framework_MockObject_MockObject */
-	private $request;
-	/** @var  \OC\Core\Controller\OccController | \PHPUnit_Framework_MockObject_MockObject */
-	private $controller;
-	/** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */
-	private $config;
-	/** @var  Application | \PHPUnit_Framework_MockObject_MockObject */
-	private $console;
-
-	public function testFromInvalidLocation(){
-		$this->getControllerMock('example.org');
-
-		$response = $this->controller->execute('status', '');
-		$responseData = $response->getData();
-
-		$this->assertArrayHasKey('exitCode', $responseData);
-		$this->assertEquals(126, $responseData['exitCode']);
-
-		$this->assertArrayHasKey('details', $responseData);
-		$this->assertEquals('Web executor is not allowed to run from a different host', $responseData['details']);
-	}
-
-	public function testNotWhiteListedCommand(){
-		$this->getControllerMock('localhost');
-
-		$response = $this->controller->execute('missing_command', '');
-		$responseData = $response->getData();
-
-		$this->assertArrayHasKey('exitCode', $responseData);
-		$this->assertEquals(126, $responseData['exitCode']);
-
-		$this->assertArrayHasKey('details', $responseData);
-		$this->assertEquals('Command "missing_command" is not allowed to run via web request', $responseData['details']);
-	}
-
-	public function testWrongToken(){
-		$this->getControllerMock('localhost');
-
-		$response = $this->controller->execute('status', self::TEMP_SECRET . '-');
-		$responseData = $response->getData();
-
-		$this->assertArrayHasKey('exitCode', $responseData);
-		$this->assertEquals(126, $responseData['exitCode']);
-
-		$this->assertArrayHasKey('details', $responseData);
-		$this->assertEquals('updater.secret does not match the provided token', $responseData['details']);
-	}
-
-	public function testSuccess(){
-		$this->getControllerMock('localhost');
-		$this->console->expects($this->once())->method('run')
-			->willReturnCallback(
-				function ($input, $output) {
-					/** @var Output $output */
-					$output->writeln('{"installed":true,"version":"9.1.0.8","versionstring":"9.1.0 beta 2","edition":""}');
-					return 0;
-				}
-			);
-
-		$response = $this->controller->execute('status', self::TEMP_SECRET, ['--output'=>'json']);
-		$responseData = $response->getData();
-
-		$this->assertArrayHasKey('exitCode', $responseData);
-		$this->assertEquals(0, $responseData['exitCode']);
-
-		$this->assertArrayHasKey('response', $responseData);
-		$decoded = json_decode($responseData['response'], true);
-
-		$this->assertArrayHasKey('installed', $decoded);
-		$this->assertEquals(true, $decoded['installed']);
-	}
-
-	private function getControllerMock($host){
-		$this->request = $this->getMockBuilder('OC\AppFramework\Http\Request')
-			->setConstructorArgs([
-				['server' => []],
-				\OC::$server->getSecureRandom(),
-				\OC::$server->getConfig()
-			])
-			->setMethods(['getRemoteAddress'])
-			->getMock();
-
-		$this->request->expects($this->any())->method('getRemoteAddress')
-			->will($this->returnValue($host));
-
-		$this->config = $this->getMockBuilder('\OCP\IConfig')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->config->expects($this->any())->method('getSystemValue')
-			->with('updater.secret')
-			->willReturn(password_hash(self::TEMP_SECRET, PASSWORD_DEFAULT));
-
-		$this->console = $this->getMockBuilder('\OC\Console\Application')
-			->disableOriginalConstructor()
-			->getMock();
-
-		$this->controller = new OccController(
-			'core',
-			$this->request,
-			$this->config,
-			$this->console
-		);
-	}
-
-}
diff --git a/tests/Settings/Controller/AuthSettingsControllerTest.php b/tests/Settings/Controller/AuthSettingsControllerTest.php
index ee67b221022..1705cb5ddf1 100644
--- a/tests/Settings/Controller/AuthSettingsControllerTest.php
+++ b/tests/Settings/Controller/AuthSettingsControllerTest.php
@@ -24,6 +24,7 @@ namespace Test\Settings\Controller;
 
 use OC\AppFramework\Http;
 use OC\Authentication\Exceptions\InvalidTokenException;
+use OC\Authentication\Token\DefaultToken;
 use OC\Authentication\Token\IToken;
 use OC\Settings\Controller\AuthSettingsController;
 use OCP\AppFramework\Http\JSONResponse;
@@ -56,10 +57,17 @@ class AuthSettingsControllerTest extends TestCase {
 	}
 
 	public function testIndex() {
-		$result = [
-			'token1',
-			'token2',
+		$token1 = new DefaultToken();
+		$token1->setId(100);
+		$token2 = new DefaultToken();
+		$token2->setId(200);
+		$tokens = [
+			$token1,
+			$token2,
 		];
+		$sessionToken = new DefaultToken();
+		$sessionToken->setId(100);
+
 		$this->userManager->expects($this->once())
 			->method('get')
 			->with($this->uid)
@@ -67,9 +75,31 @@ class AuthSettingsControllerTest extends TestCase {
 		$this->tokenProvider->expects($this->once())
 			->method('getTokenByUser')
 			->with($this->user)
-			->will($this->returnValue($result));
+			->will($this->returnValue($tokens));
+		$this->session->expects($this->once())
+			->method('getId')
+			->will($this->returnValue('session123'));
+		$this->tokenProvider->expects($this->once())
+			->method('getToken')
+			->with('session123')
+			->will($this->returnValue($sessionToken));
 
-		$this->assertEquals($result, $this->controller->index());
+		$this->assertEquals([
+			[
+				'id' => 100,
+				'name' => null,
+				'lastActivity' => null,
+				'type' => null,
+				'canDelete' => false,
+			],
+			[
+				'id' => 200,
+				'name' => null,
+				'lastActivity' => null,
+				'type' => null,
+				'canDelete' => true,
+			]
+		], $this->controller->index());
 	}
 
 	public function testCreate() {
@@ -107,6 +137,7 @@ class AuthSettingsControllerTest extends TestCase {
 		$expected = [
 			'token' => $newToken,
 			'deviceToken' => $deviceToken,
+			'loginName' => 'User13',
 		];
 		$this->assertEquals($expected, $this->controller->create($name));
 	}
diff --git a/tests/Settings/Controller/LogSettingsControllerTest.php b/tests/Settings/Controller/LogSettingsControllerTest.php
index e3cfa072d08..f296df9903c 100644
--- a/tests/Settings/Controller/LogSettingsControllerTest.php
+++ b/tests/Settings/Controller/LogSettingsControllerTest.php
@@ -71,9 +71,9 @@ class LogSettingsControllerTest extends \Test\TestCase {
 	public function testDownload() {
 		$response = $this->logSettingsController->download();
 
-		$expected = new StreamResponse(\OC\Log\Owncloud::getLogFilePath());
-		$expected->addHeader('Content-Type', 'application/octet-stream');
-		$expected->addHeader('Content-Disposition', 'attachment; filename="nextcloud.log"');
-		$this->assertEquals($expected, $response);
+		$this->assertInstanceOf('\OCP\AppFramework\Http\StreamResponse', $response);
+		$headers = $response->getHeaders();
+		$this->assertEquals('application/octet-stream', $headers['Content-Type']);
+		$this->assertEquals('attachment; filename="nextcloud.log"', $headers['Content-Disposition']);
 	}
 }
diff --git a/tests/objectstore/start-swift-ceph.sh b/tests/objectstore/start-swift-ceph.sh
index 089aab6a648..bbf483c2897 100755
--- a/tests/objectstore/start-swift-ceph.sh
+++ b/tests/objectstore/start-swift-ceph.sh
@@ -30,6 +30,7 @@ thisFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # create readiness notification socket
 notify_sock=$(readlink -f "$thisFolder"/dockerContainerCeph.$EXECUTOR_NUMBER.swift.sock)
+rm -f "$notify_sock" # in case an unfinished test left one behind
 mkfifo "$notify_sock"
 
 port=5034
@@ -67,7 +68,13 @@ if [[ $ready != 'READY=1' ]]; then
     docker logs $container
     exit 1
 fi
-sleep 1
+if ! "$thisFolder"/wait-for-connection ${host} 80 600; then
+    echo "[ERROR] Waited 600 seconds, no response" >&2
+    docker logs $container
+    exit 1
+fi
+echo "Waiting another 15 seconds"
+sleep 15
 
 cat > $thisFolder/swift.config.php <<DELIM
 <?php
@@ -101,5 +108,7 @@ if [ -n "$DEBUG" ]; then
     cat $thisFolder/swift.config.php
     echo "### contents of $thisFolder/dockerContainerCeph.$EXECUTOR_NUMBER.swift"
     cat $thisFolder/dockerContainerCeph.$EXECUTOR_NUMBER.swift
+    echo "### docker logs"
+    docker logs $container
     echo "############## DEBUG info end ###########"
 fi
diff --git a/tests/objectstore/wait-for-connection b/tests/objectstore/wait-for-connection
new file mode 100755
index 00000000000..2c480fb733e
--- /dev/null
+++ b/tests/objectstore/wait-for-connection
@@ -0,0 +1,45 @@
+#!/usr/bin/php
+<?php
+
+$timeout = 60;
+
+switch ($argc) {
+case 4:
+	$timeout = (float)$argv[3];
+case 3:
+	$host = $argv[1];
+	$port = (int)$argv[2];
+	break;
+default:
+	fwrite(STDERR, 'Usage: '.$argv[0].' host port [timeout]'."\n");
+	exit(2);
+}
+
+if ($timeout < 0) {
+	fwrite(STDERR, 'Timeout must be greater than zero'."\n");
+	exit(2);
+}
+if ($port < 1) {
+	fwrite(STDERR, 'Port must be an integer greater than zero'."\n");
+	exit(2);
+}
+
+$socketTimeout = (float)ini_get('default_socket_timeout');
+if ($socketTimeout > $timeout) {
+	$socketTimeout = $timeout;
+}
+
+$stopTime = time() + $timeout;
+do {
+	$sock = @fsockopen($host, $port, $errno, $errstr, $socketTimeout);
+	if ($sock !== false) {
+		fclose($sock);
+		fwrite(STDOUT, "\n");
+		exit(0);
+	}
+	sleep(1);
+	fwrite(STDOUT, '.');
+} while (time() < $stopTime);
+
+fwrite(STDOUT, "\n");
+exit(1);