From 2c0743c46b8c338538a80e7e6bd01c33c59bacc6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 25 May 2016 16:51:02 +0200
Subject: [PATCH] Fix the tests again
---
.../tests/Integration/Lib/IntegrationTestBackupServer.php | 2 +-
.../user_ldap/tests/Integration/Lib/IntegrationTestConnect.php | 2 +-
.../Integration/Lib/IntegrationTestCountUsersByLoginName.php | 2 +-
.../Integration/Lib/IntegrationTestFetchUsersByLoginName.php | 2 +-
tests/apps.php | 3 +++
5 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/apps/user_ldap/tests/Integration/Lib/IntegrationTestBackupServer.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestBackupServer.php
index ccd9b251bfc..6c3907eb062 100644
--- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestBackupServer.php
+++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestBackupServer.php
@@ -112,6 +112,6 @@ class IntegrationTestBackupServer extends AbstractIntegrationTest {
}
require_once(__DIR__ . '/../setup-scripts/config.php');
-$test = new IntegrationBackupServer($host, $port, $adn, $apwd, $bdn);
+$test = new IntegrationTestBackupServer($host, $port, $adn, $apwd, $bdn);
$test->init();
$test->run();
diff --git a/apps/user_ldap/tests/Integration/Lib/IntegrationTestConnect.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestConnect.php
index 3ada556bbea..fb6886189a6 100644
--- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestConnect.php
+++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestConnect.php
@@ -160,6 +160,6 @@ class IntegrationTestConnect extends AbstractIntegrationTest {
}
require_once(__DIR__ . '/../setup-scripts/config.php');
-$test = new IntegrationConnect($host, $port, $adn, $apwd, $bdn);
+$test = new IntegrationTestConnect($host, $port, $adn, $apwd, $bdn);
$test->init();
$test->run();
diff --git a/apps/user_ldap/tests/Integration/Lib/IntegrationTestCountUsersByLoginName.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestCountUsersByLoginName.php
index 5f4fd6f572f..5a49ed165ab 100644
--- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestCountUsersByLoginName.php
+++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestCountUsersByLoginName.php
@@ -60,6 +60,6 @@ class IntegrationTestCountUsersByLoginName extends AbstractIntegrationTest {
}
require_once(__DIR__ . '/../setup-scripts/config.php');
-$test = new IntegrationTestUserHome($host, $port, $adn, $apwd, $bdn);
+$test = new IntegrationTestCountUsersByLoginName($host, $port, $adn, $apwd, $bdn);
$test->init();
$test->run();
diff --git a/apps/user_ldap/tests/Integration/Lib/IntegrationTestFetchUsersByLoginName.php b/apps/user_ldap/tests/Integration/Lib/IntegrationTestFetchUsersByLoginName.php
index f2dbd7393f3..06aa2cea8fc 100644
--- a/apps/user_ldap/tests/Integration/Lib/IntegrationTestFetchUsersByLoginName.php
+++ b/apps/user_ldap/tests/Integration/Lib/IntegrationTestFetchUsersByLoginName.php
@@ -73,6 +73,6 @@ class IntegrationTestFetchUsersByLoginName extends AbstractIntegrationTest {
}
require_once(__DIR__ . '/../setup-scripts/config.php');
-$test = new IntegrationTestUserHome($host, $port, $adn, $apwd, $bdn);
+$test = new IntegrationTestFetchUsersByLoginName($host, $port, $adn, $apwd, $bdn);
$test->init();
$test->run();
diff --git a/tests/apps.php b/tests/apps.php
index f13a996772f..63895cbd569 100644
--- a/tests/apps.php
+++ b/tests/apps.php
@@ -10,6 +10,9 @@ function loadDirectory($path) {
if (strpos($path, 'integration')) {
return;
}
+ if (strpos($path, 'Integration')) {
+ return;
+ }
if ($dh = opendir($path)) {
while ($name = readdir($dh)) {
if ($name[0] !== '.') {
--
GitLab