aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/auth/provider_ldap_test.php1
-rwxr-xr-xtravis/setup-ldap.sh1
2 files changed, 1 insertions, 1 deletions
diff --git a/tests/auth/provider_ldap_test.php b/tests/auth/provider_ldap_test.php
index 2b3c377d9e..211966875e 100644
--- a/tests/auth/provider_ldap_test.php
+++ b/tests/auth/provider_ldap_test.php
@@ -38,6 +38,7 @@ class phpbb_auth_provider_ldap_test extends phpbb_database_test_case
$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
$lang = new \phpbb\language\language($lang_loader);
$this->user = new \phpbb\user($lang, '\phpbb\datetime');
+ $this->user->data['username'] = 'admin';
$this->provider = new \phpbb\auth\provider\ldap($config, $db, $lang, $this->user);
}
diff --git a/travis/setup-ldap.sh b/travis/setup-ldap.sh
index 699bb9eae8..14b32d4048 100755
--- a/travis/setup-ldap.sh
+++ b/travis/setup-ldap.sh
@@ -16,7 +16,6 @@ SLOWTESTS=$1
if [ "$SLOWTESTS" == '1' ]
then
sudo apt-get -y install ldap-utils slapd php5-ldap
- echo "extension = ldap.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
mkdir /tmp/slapd
slapd -f travis/ldap/slapd.conf -h ldap://localhost:3389 &
sleep 3