mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move all Docker-related logic to NextcloudTestServerDockerHelper 

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
This commit is contained in:
Daniel Calviño Sánchez 2017-04-10 18:59:31 +02:00
parent 38efa97aa5
commit dead90f1cf
2 changed files with 79 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
build/acceptance/features/core/NextcloudTestServerContext.php
View File

@ -88,20 +88,9 @@ class NextcloudTestServerContext implements Context {
* @throws \Exception if the Docker container can not be started.
*/
public function setUpNextcloudTestServer(BeforeScenarioScope $scope) {
$this->dockerHelper->createAndStartContainer();
$this->dockerHelper->setUp();
$serverAddress = $this->dockerHelper->getNextcloudTestServerAddress();
$isServerReadyCallback = function() use ($serverAddress) {
return $this->isServerReady($serverAddress);
};
$timeout = 10;
$timeoutStep = 0.5;
if (!Utils::waitFor($isServerReadyCallback, $timeout, $timeoutStep)) {
throw new Exception("Docker container for Nextcloud could not be started");
}
$this->setBaseUrlInSiblingRawMinkContexts($scope, "http://" . $serverAddress . "/index.php");
$this->setBaseUrlInSiblingRawMinkContexts($scope, $this->dockerHelper->getBaseUrl());
}
/**
@ -117,30 +106,7 @@ class NextcloudTestServerContext implements Context {
* @throws \Exception if the Docker container can not be removed.
*/
public function cleanUpNextcloudTestServer() {
$this->dockerHelper->stopAndRemoveContainer();
$wasContainerRemovedCallback = function() {
return !$this->dockerHelper->isContainerRegistered();
};
$timeout = 10;
$timeoutStep = 0.5;
if (!Utils::waitFor($wasContainerRemovedCallback, $timeout, $timeoutStep)) {
throw new Exception("Docker container for Nextcloud (" . $this->dockerHelper->getContainerName() . ") could not be removed");
}
}
private function isServerReady($serverAddress) {
$curlHandle = curl_init("http://" . $serverAddress);
// Returning the transfer as the result of curl_exec prevents the
// transfer from being written to the output.
curl_setopt($curlHandle, CURLOPT_RETURNTRANSFER, true);
$transfer = curl_exec($curlHandle);
curl_close($curlHandle);
return $transfer !== false;
$this->dockerHelper->cleanUp();
}
private function setBaseUrlInSiblingRawMinkContexts(BeforeScenarioScope $scope, $baseUrl) {

79
build/acceptance/features/core/NextcloudTestServerDockerHelper.php
View File

@ -39,9 +39,8 @@
* accessed through a local port in the host system mapped to the port 80 of the
* Docker container; if the Nextcloud server was instead accessed directly
* through its IP address it would complain that it was being accessed from an
* untrusted domain and refuse to work until the admin whitelisted it. The IP
* address and port to access the Nextcloud server can be got from
* "getNextcloudTestServerAddress".
* untrusted domain and refuse to work until the admin whitelisted it. The base
* URL to access the Nextcloud server can be got from "getBaseUrl".
*
* For better compatibility, Docker CLI commands used internally follow the
* pre-1.13 syntax (also available in 1.13 and newer). For example,
@ -97,6 +96,32 @@ class NextcloudTestServerDockerHelper {
$this->containerName = null;
}
/**
* Sets up the Nextcloud test server.
*
* It starts the Docker container and waits for its Nextcloud test server to
* be started; if the server does not start after some time an exception is
* thrown (as it is just a warning for the test runner and nothing to be
* explicitly catched a plain base Exception is used).
*
* @throws \Exception if the Docker container or its Nextcloud test server
* can not be started.
*/
public function setUp() {
$this->createAndStartContainer();
$serverAddress = $this->getNextcloudTestServerAddress();
$isServerReadyCallback = function() use ($serverAddress) {
return $this->isServerReady($serverAddress);
};
$timeout = 10;
$timeoutStep = 0.5;
if (!Utils::waitFor($isServerReadyCallback, $timeout, $timeoutStep)) {
throw new Exception("Docker container for Nextcloud (" . $this->containerName . ") or its Nextcloud test server could not be started");
}
}
/**
* Creates and starts the container.
*
@ -118,6 +143,43 @@ class NextcloudTestServerDockerHelper {
$this->executeDockerCommand("run --detach --user=www-data --publish 127.0.0.1:" . $this->hostPortRangeForContainer . ":80 --name=" . $this->containerName . " " . $this->imageName);
}
private function isServerReady($serverAddress) {
$curlHandle = curl_init("http://" . $serverAddress);
// Returning the transfer as the result of curl_exec prevents the
// transfer from being written to the output.
curl_setopt($curlHandle, CURLOPT_RETURNTRANSFER, true);
$transfer = curl_exec($curlHandle);
curl_close($curlHandle);
return $transfer !== false;
}
/**
* Cleans up the Nextcloud test server.
*
* It stops and removes the Docker container; if the Docker container can
* not be removed after some time an exception is thrown (as it is just a
* warning for the test runner and nothing to be explicitly catched a plain
* base Exception is used).
*
* @throws \Exception if the Docker container can not be removed.
*/
public function cleanUp() {
$this->stopAndRemoveContainer();
$wasContainerRemovedCallback = function() {
return !$this->isContainerRegistered();
};
$timeout = 10;
$timeoutStep = 0.5;
if (!Utils::waitFor($wasContainerRemovedCallback, $timeout, $timeoutStep)) {
throw new Exception("Docker container for Nextcloud (" . $this->containerName . ") could not be removed");
}
}
/**
* Stops and removes the container.
*
@ -141,6 +203,17 @@ class NextcloudTestServerDockerHelper {
return $this->containerName;
}
/**
* Returns the base URL of the Nextcloud test server.
*
* @return string the base URL of the Nextcloud test server.
* @throws \Exception if the Docker command failed to execute or the
* container is not running.
*/
public function getBaseUrl() {
return "http://" . $this->getNextcloudTestServerAddress() . "/index.php";
}
/**
* Returns the IP address and port of the Nextcloud test server (which is
* mapped to a local port in the host).