mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-02-13 23:49:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Viktor Scharf
2025-01-16 18:17:58 +01:00
parent 9db4693a9e
commit 1a20a85928
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/acceptance/TestHelpers/OcHelper.php
View File

@@ -49,6 +49,7 @@ class OcHelper {
public const STORAGE_DRIVERS = [
StorageDriver::OCIS,
StorageDriver::EOS,
StorageDriver::OWNCLOUD,
StorageDriver::S3NG,
StorageDriver::POSIX
];
@@ -139,7 +140,7 @@ class OcHelper {
$user = $user["actualUsername"];
}
if ($deleteCmd === false) {
if (self::getStorageDriver() === StorageDriver::OCIS) {
if (self::getStorageDriver() === StorageDriver::OWNCLOUD) {
self::recurseRmdir(self::getOcRevaDataRoot() . $user);
}
continue;
@@ -205,7 +206,7 @@ class OcHelper {
*/
public static function getBaseDN(): string {
$dn = \getenv("REVA_LDAP_BASE_DN");
return $dn ?: "dc=opencloud,dc=com";
return $dn ?: "dc=owncloud,dc=com";
}
/**
@@ -244,7 +245,7 @@ class OcHelper {
*/
public static function getBindDN(): string {
$dn = \getenv("REVA_LDAP_BIND_DN");
return $dn ?: "cn=admin,dc=opencloud,dc=com";
return $dn ?: "cn=admin,dc=owncloud,dc=com";
}
/**

2
tests/acceptance/bootstrap/FeatureContext.php
View File

@@ -752,7 +752,7 @@ class FeatureContext extends BehatVariablesContext {
*/
public function getStorageUsersRoot(): string {
$ocDataPath = getenv("OC_BASE_DATA_PATH") ? getenv("OC_BASE_DATA_PATH") : getenv("HOME") . '/.opencloud';
return getenv("STORAGE_USERS_OC_ROOT") ? getenv("STORAGE_USERS_OC_ROOT") : $ocDataPath . "/storage/users";
return getenv("STORAGE_USERS_OCIS_ROOT") ? getenv("STORAGE_USERS_OCIS_ROOT") : $ocDataPath . "/storage/users";
}
/**

4
tests/acceptance/config/ldap-users.ldif
View File

@@ -1,9 +1,9 @@
dn: ou=TestUsers,dc=opencloud,dc=com
dn: ou=TestUsers,dc=owncloud,dc=com
objectclass: top
objectclass: organizationalUnit
ou: TestUsers
dn: ou=TestGroups,dc=opencloud,dc=com
dn: ou=TestGroups,dc=owncloud,dc=com
objectclass: top
objectclass: organizationalUnit
ou: TestGroups