diff options
author | Andreas Gohr <andi@splitbrain.org> | 2015-04-25 10:20:14 +0200 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2015-04-25 10:20:14 +0200 |
commit | bd8c2ebfb888520b80db00d3c1c6288be289862c (patch) | |
tree | 5cb6cbd617670157fe4a07ed598d435ac1ab302f /_test | |
parent | 7d986b28c67e25c25b73625af13967137a426d0f (diff) | |
download | rpg-bd8c2ebfb888520b80db00d3c1c6288be289862c.tar.gz rpg-bd8c2ebfb888520b80db00d3c1c6288be289862c.tar.bz2 |
introduce new "flaky" test group
this group is skipped by default
Diffstat (limited to '_test')
-rw-r--r-- | _test/phpunit.xml | 6 | ||||
-rw-r--r-- | _test/tests/inc/cache_use.test.php | 19 | ||||
-rw-r--r-- | _test/tests/inc/httpclient_http.test.php | 1 |
3 files changed, 14 insertions, 12 deletions
diff --git a/_test/phpunit.xml b/_test/phpunit.xml index 25506b1ae..6e2509749 100644 --- a/_test/phpunit.xml +++ b/_test/phpunit.xml @@ -18,6 +18,12 @@ </testsuite> </testsuites> + <groups> + <exclude> + <group>flaky</group> + </exclude> + </groups> + <filter> <whitelist addUncoveredFilesFromWhitelist="false"> <directory suffix=".php">../</directory> diff --git a/_test/tests/inc/cache_use.test.php b/_test/tests/inc/cache_use.test.php index 3ea212d50..c0c12580a 100644 --- a/_test/tests/inc/cache_use.test.php +++ b/_test/tests/inc/cache_use.test.php @@ -4,6 +4,8 @@ * Class cache_use_test * * Tests if caching can actually be used + * + * @todo tests marked as flaky until Ticket #694 has been fixed */ class cache_use_test extends DokuWikiTest { /** @var cache_renderer $cache */ @@ -28,18 +30,11 @@ class cache_use_test extends DokuWikiTest { touch($this->cache->cache, $time); } - function test_use() { - $this->markTestSkipped('Disabled until Ticket #694 has been fixed'); - return; - - $this->assertTrue($this->cache->useCache()); - } - /** * In all the following tests the cache should not be usable * as such, they are meaningless if test_use didn't pass. * - * @depends test_use + * @group flaky */ function test_purge() { /* @var Input $INPUT */ @@ -51,7 +46,7 @@ class cache_use_test extends DokuWikiTest { } /** - * @depends test_use + * @group flaky */ function test_filedependency() { // give the dependent src file the same mtime as the cache @@ -60,7 +55,7 @@ class cache_use_test extends DokuWikiTest { } /** - * @depends test_use + * @group flaky */ function test_age() { // need to age both our source file & the cache @@ -74,7 +69,7 @@ class cache_use_test extends DokuWikiTest { } /** - * @depends test_use + * @group flaky */ function test_confnocaching() { global $conf; @@ -83,4 +78,4 @@ class cache_use_test extends DokuWikiTest { $this->assertFalse($this->cache->useCache()); $this->assertNotEmpty($this->cache->_nocache); } -}
\ No newline at end of file +} diff --git a/_test/tests/inc/httpclient_http.test.php b/_test/tests/inc/httpclient_http.test.php index 3446e1184..94b8e1bc1 100644 --- a/_test/tests/inc/httpclient_http.test.php +++ b/_test/tests/inc/httpclient_http.test.php @@ -289,6 +289,7 @@ class httpclient_http_test extends DokuWikiTest { * This address caused trouble with stream_select() * * @group internet + * @group flaky */ function test_wikimatrix(){ $http = new HTTPMockClient(); |