cleanup parallel deployment tests
Signed-off-by: prashant-gurung899 <prasantgrg777@gmail.com>
This commit is contained in:
@@ -214,24 +214,6 @@ class FeatureContext extends BehatVariablesContext {
|
||||
return $this->useSharingNG;
|
||||
}
|
||||
|
||||
private string $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|null $httpStatusCode
|
||||
*
|
||||
@@ -502,9 +484,6 @@ class FeatureContext extends BehatVariablesContext {
|
||||
$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";
|
||||
|
||||
@@ -352,13 +352,6 @@ trait Provisioning {
|
||||
$this->ldap->bind();
|
||||
|
||||
$ldifFile = __DIR__ . $suiteParameters['ldapInitialUserFilePath'];
|
||||
if (OcisHelper::isTestingParallelDeployment()) {
|
||||
$behatYml = \getenv("BEHAT_YML");
|
||||
if ($behatYml) {
|
||||
$configPath = \dirname($behatYml);
|
||||
$ldifFile = $configPath . "/" . \basename($ldifFile);
|
||||
}
|
||||
}
|
||||
if (!$this->skipImportLdif) {
|
||||
$this->importLdifFile($ldifFile);
|
||||
}
|
||||
@@ -458,10 +451,6 @@ trait Provisioning {
|
||||
$entry['ownCloudUUID'] = WebDavHelper::generateUUIDv4();
|
||||
}
|
||||
|
||||
if (OcisHelper::isTestingParallelDeployment()) {
|
||||
$entry['ownCloudSelector'] = $this->getOCSelector();
|
||||
}
|
||||
|
||||
if ($this->federatedServerExists()) {
|
||||
if (!\in_array($setting['userid'], $this->ldapCreatedUsers)) {
|
||||
$this->ldap->add($newDN, $entry);
|
||||
|
||||
Reference in New Issue
Block a user