diff options
| -rw-r--r-- | build/acceptance/features/core/NextcloudTestServerDockerHelper.php | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/build/acceptance/features/core/NextcloudTestServerDockerHelper.php b/build/acceptance/features/core/NextcloudTestServerDockerHelper.php index 71c7f9ad850..69dafc2276b 100644 --- a/build/acceptance/features/core/NextcloudTestServerDockerHelper.php +++ b/build/acceptance/features/core/NextcloudTestServerDockerHelper.php @@ -192,6 +192,21 @@ class NextcloudTestServerDockerHelper { } /** + * Returns whether the container exists (no matter its state) or not. + * + * @return boolean true if the container exists, false otherwise. + * @throws \Exception if the Docker command failed to execute. + */ + private function isContainerRegistered() { + // With the "--quiet" option "docker ps" only shows the ID of the + // matching containers, without table headers. Therefore, if the + // container does not exist the output will be empty (not even a new + // line, as the last line of output returned by "executeDockerCommand" + // does not include a trailing new line character). + return $this->executeDockerCommand("ps --all --quiet --filter 'name=" . $this->containerName . "'") !== ""; + } + + /** * Returns the base URL of the Nextcloud test server. * * @return string the base URL of the Nextcloud test server. @@ -215,21 +230,6 @@ class NextcloudTestServerDockerHelper { } /** - * Returns whether the container exists (no matter its state) or not. - * - * @return boolean true if the container exists, false otherwise. - * @throws \Exception if the Docker command failed to execute. - */ - private function isContainerRegistered() { - // With the "--quiet" option "docker ps" only shows the ID of the - // matching containers, without table headers. Therefore, if the - // container does not exist the output will be empty (not even a new - // line, as the last line of output returned by "executeDockerCommand" - // does not include a trailing new line character). - return $this->executeDockerCommand("ps --all --quiet --filter 'name=" . $this->containerName . "'") !== ""; - } - - /** * Executes the given Docker command. * * @return string the last line of output, without trailing new line |