From: nodiscc <nodiscc@gmail.com>
Date: Fri, 26 Jun 2015 20:03:25 +0000 (+0200)
Subject: Merge remote-tracking branch 'ArthurHoaro/default-links'
X-Git-Tag: v0.5.0~18
X-Git-Url: https://git.immae.eu/?p=github%2Fshaarli%2FShaarli.git;a=commitdiff_plain;h=d72ae3d7e879281b842a6c56e1fe97ed9671c654

Merge remote-tracking branch 'ArthurHoaro/default-links'
---

d72ae3d7e879281b842a6c56e1fe97ed9671c654
diff --cc tests/LinkDBTest.php
index 0d343359,3b68dd20..a54fc501
--- a/tests/LinkDBTest.php
+++ b/tests/LinkDBTest.php
@@@ -120,10 -126,10 +120,10 @@@ class LinkDBTest extends PHPUnit_Framew
       */
      public function testCheckDBLoad()
      {
 -        $linkDB = new LinkDB(false, false);
 +        $linkDB = new LinkDB(self::$testDatastore, false, false);
          $this->assertEquals(
-             self::$dummyDatastoreSHA1,
-             sha1_file(self::$testDatastore)
+             self::$dummyDatastoreFilesize,
+             filesize(self::$testDatastore)
          );
  
          $checkDB = self::getMethod('checkDB');