test: adjust acceptance tests for running GitHub workflows (#41533)

* test: handle trashbin restore test when installed in subfolder

When owncloud core is installed in a subfolder, then the href for
items in the trashbin has a path that includes the subfolder.
For example:
 /server/remote.php/dav/trash-bin/Alice/...

Handle the possible presence of the subfolder at the start of the path.

* test: log messages confirming servers are up

when starting acceptance tests

* test: fix TEST_SERVER_FED_URL use in acceptance test run.sh

* chore(ci): add Apache site configs for acceptance testing

These Apache site config templates can be used to set up Apache
for single-server or dual-server (federated) testing environments
with each server in a separate subdirectory of the Apache server root.
Or, in the single-server case, installing ownCloud core directly
into the Apache root folder /var/www/html

Author: phil-davis

tests/acceptance/features/bootstrap/TrashbinContext.php

@@ -236,16 +236,24 @@ public function listTrashbinFolderCollection(?string $user, ?string $collectionP
 			__METHOD__ . " $collectionPath"
 		);
 
+		$subfolder = parse_url($this->featureContext->getBaseUrl(), PHP_URL_PATH);
+		if ($subfolder === null) {
+			$subfolder = "";
+			$subfolderWithSlashAtEnd = "";
+		} else {
+			$subfolderWithSlashAtEnd = \trim($subfolder, "/") . "/";
+		}
+
 		$files = $this->getTrashbinContentFromResponseXml($responseXml);
 		// filter out the collection itself, we only want to return the members
 		$files = \array_filter(
 			$files,
-			static function ($element) use ($user, $collectionPath) {
+			static function ($element) use ($user, $collectionPath, $subfolder) {
 				$path = $collectionPath;
 				if ($path !== "") {
 					$path = $path . "/";
 				}
-				return ($element['href'] !== "/remote.php/dav/trash-bin/$user/$path");
+				return ($element['href'] !== "$subfolder/remote.php/dav/trash-bin/$user/$path");
 			}
 		);
 
@@ -254,7 +262,7 @@ static function ($element) use ($user, $collectionPath) {
 			// avoid "common" situations that could cause infinite recursion.
 			$trashbinRef = $file["href"];
 			$trimmedTrashbinRef = \trim($trashbinRef, "/");
-			$expectedStart = "remote.php/dav/trash-bin/$user";
+			$expectedStart = "{$subfolderWithSlashAtEnd}remote.php/dav/trash-bin/$user";
 			$expectedStartLength = \strlen($expectedStart);
 			if ((\substr($trimmedTrashbinRef, 0, $expectedStartLength) !== $expectedStart)
 				|| (\strlen($trimmedTrashbinRef) === $expectedStartLength)

tests/acceptance/run.sh

@@ -298,6 +298,7 @@ function assert_server_up() {
 	curl -k -sSf -L $1/status.php -o /dev/null
 	if [[ $? -eq 0 ]]
 	then
+		echo "Server on $1 is responding to status request"
 		return
 	else
 		echo >&2 "Server on $1 is down or not working correctly."
@@ -319,6 +320,7 @@ function assert_testing_app_enabled() {
 		echo >&2 "Please install and enable it to run the tests."
 		exit 98
 	else
+		echo "Testing app is enabled on the server on $1."
 		return
 	fi
 }
@@ -788,7 +790,7 @@ then
 		OCC_FED_URL="${TESTING_APP_FED_URL}occ"
 		# test that fed server is up and running, and testing app is enabled.
 		assert_server_up ${TEST_SERVER_FED_URL}
-		assert_testing_app_enabled ${TEST_SERVER_URL}
+		assert_testing_app_enabled ${TEST_SERVER_FED_URL}
 	fi
 
 	echo "Not using php inbuilt server for running scenario ..."

tests/acceptance/setupApache/dual-server.conf

@@ -0,0 +1,17 @@
+<VirtualHost *:80>
+	ServerAdmin webmaster@localhost
+	DocumentRoot /var/www/html
+	ErrorLog ${APACHE_LOG_DIR}/error.log
+	CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+	<Directory /var/www/html${SERVER_SUBDIR}>
+		Options Indexes FollowSymLinks MultiViews
+		AllowOverride All
+		Require all granted
+	</Directory>
+	<Directory /var/www/html${FEDERATED_SUBDIR}>
+		Options Indexes FollowSymLinks MultiViews
+		AllowOverride All
+		Require all granted
+	</Directory>
+</VirtualHost>

tests/acceptance/setupApache/single-server.conf

@@ -0,0 +1,12 @@
+<VirtualHost *:80>
+	ServerAdmin webmaster@localhost
+	DocumentRoot /var/www/html
+	ErrorLog ${APACHE_LOG_DIR}/error.log
+	CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+	<Directory /var/www/html${SERVER_SUBDIR}>
+		Options Indexes FollowSymLinks MultiViews
+		AllowOverride All
+		Require all granted
+	</Directory>
+</VirtualHost>