use waitForTick in all our tests

dokuwiki · Dec 1, 2016 · aaf4f55 · aaf4f55
1 parent b994055
commit aaf4f55
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/_test/tests/inc/common_saveWikiText.test.php b/_test/tests/inc/common_saveWikiText.test.php
@@ -25,7 +25,7 @@ function test_savesequence() {
         $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 @@ function test_savesequence() {
         $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 @@ function test_savesequence() {
         $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 @@ function test_savesequence() {
         $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 @@ function test_savesequence() {
         $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 @@ function test_savesequence() {
         $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 @@ function test_savesequencedeleteexternalrevision() {
         $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 @@ function test_savesequencedeleteexternalrevision() {
         $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 @@ function test_saveexternalasfirst() {
         // 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 @@ function test_savesequenceexternaldeleteedit() {
         $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 @@ function test_savesequencerevert() {
         $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 @@ function test_savesequencerevert() {
         $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 @@ function test_savesequencerevert() {
         $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 @@ function test_savesequencerevert() {
         $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;

diff --git a/_test/tests/inc/media_get_from_url.test.php b/_test/tests/inc/media_get_from_url.test.php
@@ -17,7 +17,7 @@ public function test_cache(){
         // 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 @@ public function test_recache(){
 
         unlink($local);
     }
-}
+}
diff --git a/_test/tests/inc/remoteapicore.test.php b/_test/tests/inc/remoteapicore.test.php
@@ -525,7 +525,7 @@ public function test_coreattachments() {
         );
         $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');