diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-09 11:22:30 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-09 11:22:30 +0200 |
| commit | 3b3f941f5fa5087a3111ddd4603d0f6fa71360ba (patch) | |
| tree | 7b4e98e8f484d0cc28c1cc37341d266ba3da1b58 | |
| parent | d4fc060bcd61228fdf78da4f2d290a7a17546c46 (diff) | |
| parent | 333120a9921d8b36914965540d2d513cb939dc51 (diff) | |
| download | forums-3b3f941f5fa5087a3111ddd4603d0f6fa71360ba.tar forums-3b3f941f5fa5087a3111ddd4603d0f6fa71360ba.tar.gz forums-3b3f941f5fa5087a3111ddd4603d0f6fa71360ba.tar.bz2 forums-3b3f941f5fa5087a3111ddd4603d0f6fa71360ba.tar.xz forums-3b3f941f5fa5087a3111ddd4603d0f6fa71360ba.zip | |
Merge branch 'ticket/10839-olympus' into ticket/10839
* ticket/10839-olympus:
[ticket/10839] Fix note about running slow tests and build task
[ticket/10839] Removing phpunit.xml.all
[ticket/10839] Always run functional tests by default
Conflicts:
phpunit.xml.dist
| -rw-r--r-- | build/build.xml | 1 | ||||
| -rw-r--r-- | phpunit.xml.all | 36 | ||||
| -rw-r--r-- | phpunit.xml.dist | 4 | ||||
| -rw-r--r-- | phpunit.xml.functional | 43 | ||||
| -rw-r--r-- | tests/RUNNING_TESTS.md | 14 |
5 files changed, 12 insertions, 86 deletions
diff --git a/build/build.xml b/build/build.xml index 79b6096c97..9a04d4efdb 100644 --- a/build/build.xml +++ b/build/build.xml @@ -67,7 +67,6 @@ <exec dir="." command="phpBB/vendor/bin/phpunit --log-junit build/logs/phpunit.xml - --configuration phpunit.xml.all --group slow --coverage-clover build/logs/clover-slow.xml --coverage-html build/coverage-slow" diff --git a/phpunit.xml.all b/phpunit.xml.all deleted file mode 100644 index 73d0536b9d..0000000000 --- a/phpunit.xml.all +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<phpunit backupGlobals="true" - backupStaticAttributes="true" - colors="true" - convertErrorsToExceptions="true" - convertNoticesToExceptions="true" - convertWarningsToExceptions="true" - processIsolation="false" - stopOnFailure="false" - syntaxCheck="false" - bootstrap="tests/bootstrap.php" -> - <testsuites> - <testsuite name="phpBB Test Suite"> - <directory suffix="_test.php">./tests</directory> - <exclude>./tests/lint_test.php</exclude> - </testsuite> - <testsuite name="phpBB Lint Test"> - <file>./tests/lint_test.php</file> - </testsuite> - </testsuites> - - <filter> - <blacklist> - <directory>./tests</directory> - </blacklist> - <whitelist> - <directory suffix=".php">./phpBB/includes/</directory> - <directory suffix=".php">./phpBB/phpbb/</directory> - <exclude> - <directory suffix=".php">./phpBB/includes/captcha/</directory> - </exclude> - </whitelist> - </filter> -</phpunit> diff --git a/phpunit.xml.dist b/phpunit.xml.dist index dd039fb567..e65fdb3938 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -17,6 +17,9 @@ <exclude>./tests/functional</exclude> <exclude>./tests/lint_test.php</exclude> </testsuite> + <testsuite name="phpBB Functional Tests"> + <directory suffix="_test.php" phpVersion="5.3.0" phpVersionOperator=">=">./tests/functional</directory> + </testsuite> <testsuite name="phpBB Lint Test"> <file>./tests/lint_test.php</file> </testsuite> @@ -24,7 +27,6 @@ <groups> <exclude> - <group>functional</group> <group>slow</group> </exclude> </groups> diff --git a/phpunit.xml.functional b/phpunit.xml.functional deleted file mode 100644 index ead8f4af68..0000000000 --- a/phpunit.xml.functional +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<phpunit backupGlobals="true" - backupStaticAttributes="true" - colors="true" - convertErrorsToExceptions="true" - convertNoticesToExceptions="true" - convertWarningsToExceptions="true" - processIsolation="false" - stopOnFailure="false" - syntaxCheck="false" - bootstrap="tests/bootstrap.php" -> - <testsuites> - <testsuite name="phpBB Test Suite"> - <directory suffix="_test.php">./tests</directory> - <exclude>./tests/functional</exclude> - <exclude>./tests/lint_test.php</exclude> - </testsuite> - <testsuite name="phpBB Lint Test"> - <file>./tests/lint_test.php</file> - </testsuite> - </testsuites> - - <groups> - <include> - <group>functional</group> - </include> - </groups> - - <filter> - <blacklist> - <directory>./tests</directory> - </blacklist> - <whitelist> - <directory suffix=".php">./phpBB/includes/</directory> - <directory suffix=".php">./phpBB/phpbb/</directory> - <exclude> - <directory suffix=".php">./phpBB/includes/captcha/</directory> - </exclude> - </whitelist> - </filter> -</phpunit> diff --git a/tests/RUNNING_TESTS.md b/tests/RUNNING_TESTS.md index 0778046141..d638c86859 100644 --- a/tests/RUNNING_TESTS.md +++ b/tests/RUNNING_TESTS.md @@ -128,12 +128,16 @@ Slow tests -------------- Certain tests, such as the UTF-8 normalizer or the DNS tests tend to be slow. -Thus these tests are in the `slow` group, which is excluded by default. You can -enable slow tests by copying the phpunit.xml.all file to phpunit.xml. If you +Thus these tests are in the `slow` group, which is excluded by default. If you only want the slow tests, run: $ phpBB/vendor/bin/phpunit --group slow +If you want all tests, run: + + $ phpBB/vendor/bin/phpunit --group __nogroup__,functional,slow + + Functional tests ----------------- @@ -154,10 +158,10 @@ on which to run tests. $phpbb_functional_url = 'http://localhost/phpBB3/'; -To then run the tests, you run PHPUnit, but use the phpunit.xml.functional -config file instead of the default one. Specify this through the "-c" option: +Functional tests are automatically run, if '$phpbb_functional_url' is configured. +If you only want the functional tests, run: - $ phpBB/vendor/bin/phpunit -c phpunit.xml.functional + $ phpBB/vendor/bin/phpunit --group functional This will change your board's config.php file, but it makes a backup at config_dev.php, so you can restore it after the test run is complete. |