diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-10-29 15:10:40 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-10-29 15:10:40 +0100 |
| commit | 57afbbb48aea55cdec56c4807eaa7c9ed77eb3d0 (patch) | |
| tree | 34d7b5acb89fdd674414173769513e3cf352d8c3 /tests/test_framework/phpbb_test_case.php | |
| parent | ae55db6da49e15418020f0901619c4c832460a4d (diff) | |
| parent | 17928563a2a265f4b70feef64e5030ea3c602269 (diff) | |
| download | forums-57afbbb48aea55cdec56c4807eaa7c9ed77eb3d0.tar forums-57afbbb48aea55cdec56c4807eaa7c9ed77eb3d0.tar.gz forums-57afbbb48aea55cdec56c4807eaa7c9ed77eb3d0.tar.bz2 forums-57afbbb48aea55cdec56c4807eaa7c9ed77eb3d0.tar.xz forums-57afbbb48aea55cdec56c4807eaa7c9ed77eb3d0.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13241] Remove sleep() and change flood interval instead
[ticket/13241] Remove sleep() since the method takes care of this now
[ticket/13241] Sleep for 1 second when posting twice in the same second
[ticket/13241] Fix pagination with global announcements
[ticket/13241] Correctly ignore announcements from topics list
[ticket/13241] Add a functional test for viewforum with global announcement
Diffstat (limited to 'tests/test_framework/phpbb_test_case.php')
| -rw-r--r-- | tests/test_framework/phpbb_test_case.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_framework/phpbb_test_case.php b/tests/test_framework/phpbb_test_case.php index c39f7835d1..01d26fb67d 100644 --- a/tests/test_framework/phpbb_test_case.php +++ b/tests/test_framework/phpbb_test_case.php @@ -26,7 +26,7 @@ class phpbb_test_case extends PHPUnit_Framework_TestCase 'PHP_Token_Stream' => array('customTokens'), 'PHP_Token_Stream_CachingFactory' => array('cache'), - 'phpbb_database_test_case' => array('already_connected'), + 'phpbb_database_test_case' => array('already_connected', 'last_post_timestamp'), ); } |