diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-01-24 21:52:56 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-01-24 21:52:56 +0100 |
| commit | a2fbde44c0277b793477392ad403bcbcea080934 (patch) | |
| tree | 70e5f826114c53422df7f5b6535e4318aa336edf | |
| parent | 9cdbb69f9e50f665caad54fc93f64143cb7d8fc8 (diff) | |
| parent | b2674cf1f612dd03dc3b11173462007caf08d187 (diff) | |
| download | forums-a2fbde44c0277b793477392ad403bcbcea080934.tar forums-a2fbde44c0277b793477392ad403bcbcea080934.tar.gz forums-a2fbde44c0277b793477392ad403bcbcea080934.tar.bz2 forums-a2fbde44c0277b793477392ad403bcbcea080934.tar.xz forums-a2fbde44c0277b793477392ad403bcbcea080934.zip | |
Merge pull request #3336 from nickvergessen/ticket/13543
Ticket/13543
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | tests/functions/get_remote_file_test.php | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 2e0b68c3de..b7b17f2f19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,8 @@ matrix: env: DB=postgres - php: 5.4 env: DB=sqlite3 + - php: 5.4 + env: DB=mysqli;SLOWTESTS=1 - php: 5.5 env: DB=mysqli - php: 5.6 @@ -41,6 +43,7 @@ script: - travis/check-sami-parse-errors.sh $DB $TRAVIS_PHP_VERSION - travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION - travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION ./ - - phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml + - sh -c "if [ '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi" + - sh -c "if [ '$SLOWTESTS' = '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --group slow; fi" - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -a '$DB' = 'mysqli' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi" diff --git a/tests/functions/get_remote_file_test.php b/tests/functions/get_remote_file_test.php index d412dce164..612d82273e 100644 --- a/tests/functions/get_remote_file_test.php +++ b/tests/functions/get_remote_file_test.php @@ -21,6 +21,10 @@ class phpbb_functions_get_remote_file extends phpbb_test_case { public function test_version_phpbb_com() { + global $phpbb_container; + $phpbb_container = new phpbb_mock_container_builder(); + $phpbb_container->set('file_downloader', new \phpbb\file_downloader()); + $hostname = 'version.phpbb.com'; if (!phpbb_checkdnsrr($hostname, 'A')) |