Skip to content
Snippets Groups Projects
Commit aaf4f55e authored by Andreas Gohr's avatar Andreas Gohr
Browse files

use waitForTick in all our tests

parent b9940551
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
_test/tests/inc/common_saveWikiText.test.php
+ 17
− 17
View file @ aaf4f55e
......@@ -25,7 +25,7 @@ class common_saveWikiText_test extends DokuWikiTest {
$this->assertEquals(DOKU_CHANGE_TYPE_CREATE, $revinfo['type']);
$this->assertEquals(10, $revinfo['sizechange']);
sleep(1); // wait for new revision ID
$this->waitForTick(true); // wait for new revision ID
// save with same content should be ignored
saveWikiText($page, 'teststring', 'second save', false);
......@@ -51,7 +51,7 @@ class common_saveWikiText_test extends DokuWikiTest {
$this->assertEquals(DOKU_CHANGE_TYPE_EDIT, $revinfo['type']);
$this->assertEquals(5, $revinfo['sizechange']);
sleep(1); // wait for new revision ID
$this->waitForTick(); // wait for new revision ID
// add a minor edit (unauthenticated)
saveWikiText($page, 'teststring3long', 'fourth save', true);
......@@ -68,7 +68,7 @@ class common_saveWikiText_test extends DokuWikiTest {
$this->assertEquals(DOKU_CHANGE_TYPE_EDIT, $revinfo['type']);
$this->assertEquals(0, $revinfo['sizechange']);
sleep(1); // wait for new revision ID
$this->waitForTick(); // wait for new revision ID
// add a minor edit (authenticated)
$_SERVER['REMOTE_USER'] = 'user';
......@@ -86,7 +86,7 @@ class common_saveWikiText_test extends DokuWikiTest {
$this->assertEquals(DOKU_CHANGE_TYPE_MINOR_EDIT, $revinfo['type']);
$this->assertEquals(-4, $revinfo['sizechange']);
sleep(1); // wait for new revision ID
$this->waitForTick(); // wait for new revision ID
// delete
saveWikiText($page, '', 'sixth save', false);
......@@ -101,7 +101,7 @@ class common_saveWikiText_test extends DokuWikiTest {
$this->assertEquals(DOKU_CHANGE_TYPE_DELETE, $revinfo['type']);
$this->assertEquals(-11, $revinfo['sizechange']);
sleep(1); // wait for new revision ID
$this->waitForTick(); // wait for new revision ID
// restore
$REV = $lastmod;
......@@ -122,12 +122,12 @@ class common_saveWikiText_test extends DokuWikiTest {
$this->assertEquals(11, $revinfo['sizechange']);
$REV = '';
sleep(1); // wait for new revision ID
$this->waitForTick(); // wait for new revision ID
// create external edit
file_put_contents($file, 'teststring5');
sleep(1); // wait for new revision ID
$this->waitForTick(); // wait for new revision ID
// save on top of external edit
saveWikiText($page, 'teststring6', 'eigth save', false);
......@@ -172,7 +172,7 @@ class common_saveWikiText_test extends DokuWikiTest {
$this->assertEquals(DOKU_CHANGE_TYPE_CREATE, $revinfo['type']);
$this->assertEquals(10, $revinfo['sizechange']);
sleep(1); // wait for new revision ID
$this->waitForTick(true); // wait for new revision ID
// delete
saveWikiText($page, '', 'second save', false);
......@@ -187,12 +187,12 @@ class common_saveWikiText_test extends DokuWikiTest {
$this->assertEquals(DOKU_CHANGE_TYPE_DELETE, $revinfo['type']);
$this->assertEquals(-10, $revinfo['sizechange']);
sleep(1); // wait for new revision ID
$this->waitForTick(); // wait for new revision ID
// create external edit
file_put_contents($file, 'teststring5');
sleep(1); // wait for new revision ID
$this->waitForTick(); // wait for new revision ID
// save on top of external edit
saveWikiText($page, 'teststring6', 'third save', false);
......@@ -226,7 +226,7 @@ class common_saveWikiText_test extends DokuWikiTest {
// create external edit
file_put_contents($file, 'teststring');
sleep(1); // wait for new revision ID
$this->waitForTick(true); // wait for new revision ID
// save on top of external edit
saveWikiText($page, 'teststring6', 'first save', false);
......@@ -268,14 +268,14 @@ class common_saveWikiText_test extends DokuWikiTest {
$this->assertEquals(DOKU_CHANGE_TYPE_CREATE, $revinfo['type']);
$this->assertEquals(10, $revinfo['sizechange']);
sleep(1); // wait for new revision ID
$this->waitForTick(true); // wait for new revision ID
// create external delete
unlink($file);
clearstatcache(false, $file);
sleep(1); // wait for new revision ID
$this->waitForTick(); // wait for new revision ID
// save on top of external delete. save is seen as creation
saveWikiText($page, 'teststring6', 'second save', false);
......@@ -317,7 +317,7 @@ class common_saveWikiText_test extends DokuWikiTest {
$this->assertEquals(DOKU_CHANGE_TYPE_CREATE, $revinfo['type']);
$this->assertEquals(10, $revinfo['sizechange']);
sleep(1); // wait for new revision ID
$this->waitForTick(true); // wait for new revision ID
// save with same content should be ignored
saveWikiText($page, 'teststring', 'second save', false);
......@@ -344,7 +344,7 @@ class common_saveWikiText_test extends DokuWikiTest {
$this->assertEquals(DOKU_CHANGE_TYPE_EDIT, $revinfo['type']);
$this->assertEquals(5, $revinfo['sizechange']);
sleep(1); // wait for new revision ID
$this->waitForTick(); // wait for new revision ID
// add a minor edit (unauthenticated)
saveWikiText($page, 'teststring3long', 'fourth save', true);
......@@ -361,7 +361,7 @@ class common_saveWikiText_test extends DokuWikiTest {
$this->assertEquals(DOKU_CHANGE_TYPE_EDIT, $revinfo['type']);
$this->assertEquals(0, $revinfo['sizechange']);
sleep(1); // wait for new revision ID
$this->waitForTick(); // wait for new revision ID
// add a minor edit (authenticated)
$_SERVER['REMOTE_USER'] = 'user';
......@@ -379,7 +379,7 @@ class common_saveWikiText_test extends DokuWikiTest {
$this->assertEquals(DOKU_CHANGE_TYPE_MINOR_EDIT, $revinfo['type']);
$this->assertEquals(-4, $revinfo['sizechange']);
sleep(1); // wait for new revision ID
$this->waitForTick(); // wait for new revision ID
// restore
$REV = $revertrev;
......
_test/tests/inc/media_get_from_url.test.php
+ 2
− 2
View file @ aaf4f55e
......@@ -17,7 +17,7 @@ class media_get_from_url_test extends DokuWikiTest {
// remember time stamp
$time = filemtime($local);
clearstatcache(false, $local);
sleep(1);
$this->waitForTick(true);
// fetch again and make sure we got a cache file
$local = media_get_from_URL('http://www.google.com/images/srpr/logo3w.png','png',-1);
......@@ -77,4 +77,4 @@ class media_get_from_url_test extends DokuWikiTest {
unlink($local);
}
}
\ No newline at end of file
}
_test/tests/inc/remoteapicore.test.php
+ 1
− 1
View file @ aaf4f55e
......@@ -525,7 +525,7 @@ You can use up to five different levels of',
);
$this->assertEquals($expected, $this->remote->call('wiki.getRecentMediaChanges', $params));
sleep(1);
$this->waitForTick(true);
$conf['useacl'] = 1;
$_SERVER['REMOTE_USER'] = 'john';
$USERINFO['grps'] = array('user');
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment