[full-ci][tests-only] Refactor test codes for parallel deployment tests

tests/TestHelpers/HttpRequestHelper.php

@@ -42,6 +42,28 @@
  * Helper for HTTP requests
  */
 class HttpRequestHelper {
+
+	/**
+	 * @var string
+	 */
+	private static $oCSelectorCookie = null;
+
+	/**
+	 * @return string
+	 */
+	public static function getOCSelectorCookie(): string {
+		return self::$oCSelectorCookie;
+	}
+
+	/**
+	 * @param string $oCSelectorCookie	"owncloud-selector=oc10;path=/;"
+	 *
+	 * @return void
+	 */
+	public static function setOCSelectorCookie(string $oCSelectorCookie): void {
+		self::$oCSelectorCookie = $oCSelectorCookie;
+	}
+
 	/**
 	 *
 	 * @param string|null $url
@@ -296,6 +318,22 @@ public static function createRequest(
 			$body = \http_build_query($body, '', '&');
 			$headers['Content-Type'] = 'application/x-www-form-urlencoded';
 		}
+
+		if (OcisHelper::isTestingParallelDeployment()) {
+			// oCIS cannot handle '/apps/testing' endpoints
+			// so those requests must be redirected to oC10 server
+			// change server to oC10 if the request url has `/apps/testing`
+			if (strpos($url, "/apps/testing") !== false) {
+				$oCISServerUrl = \getenv('TEST_SERVER_URL');
+				$oC10ServerUrl = \getenv('TEST_OC10_URL');
+
+				$url = str_replace($oCISServerUrl, $oC10ServerUrl, $url);
+			} else {
+				// set 'owncloud-server' selector cookie for oCIS requests
+				$headers['Cookie'] = self::getOCSelectorCookie();
+			}
+		}
+
 		$request = new Request(
 			$method,
 			$url,

tests/TestHelpers/OcisHelper.php

@@ -61,6 +61,13 @@ public static function isTestingOnOc10():bool {
 		return (!self::isTestingOnOcisOrReva());
 	}
 
+	/**
+	 * @return bool
+	 */
+	public static function isTestingParallelDeployment(): bool {
+		return (\getenv("TEST_PARALLEL_DEPLOYMENT") === "true");
+	}
+
 	/**
 	 * @return bool|string false if no command given or the command as string
 	 */

tests/TestHelpers/SetupHelper.php

@@ -865,7 +865,7 @@ public static function runOcc(
 		?string $ocPath = null,
 		?array $envVariables = null
 	):array {
-		if (OcisHelper::isTestingOnOcisOrReva()) {
+		if (OcisHelper::isTestingOnOcisOrReva() && !OcisHelper::isTestingParallelDeployment()) {
 			return ['code' => '', 'stdOut' => '', 'stdErr' => '' ];
 		}
 		$baseUrl = self::checkBaseUrl($baseUrl, "runOcc");

tests/acceptance/features/bootstrap/FeatureContext.php

@@ -315,6 +315,27 @@ class FeatureContext extends BehatVariablesContext {
 	 */
 	private $lastOCSStatusCodesArray = [];
 
+	/**
+	 * @var string
+	 */
+	private $oCSelector;
+
+	/**
+	 * @param string $selector
+	 *
+	 * @return void
+	 */
+	public function setOCSelector(string $selector): void {
+		$this->oCSelector = $selector;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getOCSelector(): string {
+		return $this->oCSelector;
+	}
+
 	/**
 	 * @param string $httpStatusCode
 	 *
@@ -584,6 +605,9 @@ public function __construct(
 		$this->cookieJar = new CookieJar();
 		$this->ocPath = $ocPath;
 
+		// PARALLEL DEPLOYMENT: ownCloud selector
+		$this->oCSelector = "oc10";
+
 		// These passwords are referenced in tests and can be overridden by
 		// setting environment variables.
 		$this->alt1UserPassword = "1234";

tests/acceptance/features/bootstrap/Provisioning.php

@@ -584,9 +584,16 @@ public function connectToLdap(array $suiteParameters):void {
 		];
 		$this->ldap = new Ldap($options);
 		$this->ldap->bind();
-		$this->importLdifFile(
-			__DIR__ . (string)$suiteParameters['ldapInitialUserFilePath']
-		);
+
+		$ldifFile = __DIR__ . (string)$suiteParameters['ldapInitialUserFilePath'];
+		if (OcisHelper::isTestingParallelDeployment()) {
+			$behatYml = \getenv("BEHAT_YML");
+			if ($behatYml) {
+				$configPath = \dirname($behatYml);
+				$ldifFile = $configPath . "/" . \basename($ldifFile);
+			}
+		}
+		$this->importLdifFile($ldifFile);
 		$this->theLdapUsersHaveBeenResynced();
 	}
 
@@ -597,7 +604,8 @@ public function connectToLdap(array $suiteParameters):void {
 	 * @throws Exception
 	 */
 	public function theLdapUsersHaveBeenReSynced():void {
-		if (!OcisHelper::isTestingOnOcisOrReva()) {
+		// we need to sync ldap users when testing for parallel deployment
+		if (!OcisHelper::isTestingOnOcisOrReva() || OcisHelper::isTestingParallelDeployment()) {
 			$occResult = SetupHelper::runOcc(
 				['user:sync', 'OCA\User_LDAP\User_Proxy', '-m', 'remove'],
 				$this->getStepLineRef()
@@ -666,6 +674,20 @@ public function buildUsersAttributesArray(bool $setDefaultAttributes, array $tab
 		return $usersAttributes;
 	}
 
+	/**
+	 * Generates UUIDV4
+	 * Example: 123e4567-e89b-12d3-a456-426614174000
+	 *
+	 * @return string
+	 */
+	public function generateUUIDv4(): string {
+		$data = random_bytes(16);
+		$data[6] = \chr(\ord($data[6]) & 0x0f | 0x40);
+		$data[8] = \chr(\ord($data[8]) & 0x3f | 0x80);
+
+		return vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($data), 4));
+	}
+
 	/**
 	 * creates a user in the ldap server
 	 * the created user is added to `createdUsersList`
@@ -702,6 +724,16 @@ public function createLdapUser(array $setting):void {
 		$entry['gidNumber'] = 5000;
 		$entry['uidNumber'] = $uidNumber;
 
+		if (OcisHelper::isTestingParallelDeployment()) {
+			$entry['objectclass'][] = 'organizationalPerson';
+			$entry['objectclass'][] = 'ownCloud';
+			$entry['objectclass'][] = 'person';
+			$entry['objectclass'][] = 'top';
+			$entry['uid'] = $setting["userid"];
+			$entry['ownCloudSelector'] = $this->getOCSelector();
+			$entry['ownCloudUUID'] = $this->generateUUIDv4();
+		}
+
 		if ($this->federatedServerExists()) {
 			if (!\in_array($setting['userid'], $this->ldapCreatedUsers)) {
 				$this->ldap->add($newDN, $entry);
@@ -3136,7 +3168,11 @@ public function userExists(?string $user):bool {
 			// So use admin account to list the user
 			// https://github.com/owncloud/ocis/issues/820
 			// The special code can be reverted once the issue is fixed
-			if (OcisHelper::isTestingOnOcis()) {
+			if (OcisHelper::isTestingParallelDeployment()) {
+				$requestingUser = $this->getActualUsername($user);
+				;
+				$requestingPassword = $this->getPasswordForUser($user);
+			} elseif (OcisHelper::isTestingOnOcis()) {
 				$requestingUser = 'moss';
 				$requestingPassword = 'vista';
 			} else {