Merge remote-tracking branch 'origin/MAGETWO-35777-Random-Errors' into develop

Olga Kopylova · Olga Kopylova · commit 161337910d4e · 2015-04-15T11:52:00.000-05:00
diff --git a/app/code/Magento/Log/Test/Unit/Model/VisitorTest.php b/app/code/Magento/Log/Test/Unit/Model/VisitorTest.php
@@ -122,13 +122,23 @@ public function testGetUrl()
     public function testGetFirstVisitAt()
     {
         $time = time();
-        $this->assertEquals($time, $this->visitor->getFirstVisitAt());
+        $this->assertEquals(
+            $time,
+            $this->visitor->getFirstVisitAt(),
+            'VisitorTest failed to assert the time for the first visit within 5 seconds.',
+            5
+        );
     }
 
     public function testGetLastVisitAt()
     {
         $time = time();
-        $this->assertEquals($time, $this->visitor->getLastVisitAt());
+        $this->assertEquals(
+            $time,
+            $this->visitor->getLastVisitAt(),
+            'VisitorTest failed to assert the time for the last visit within 5 seconds.',
+            5
+        );
     }
 
     public function testLogNewVisitor()

Original file line number	Diff line number	Diff line change
`@@ -122,13 +122,23 @@ public function testGetUrl()`
`122`	`122`	`public function testGetFirstVisitAt()`
`123`	`123`	`{`
`124`	`124`	`$time = time();`
`125`		`- $this->assertEquals($time, $this->visitor->getFirstVisitAt());`
	`125`	`+ $this->assertEquals(`
	`126`	`+ $time,`
	`127`	`+ $this->visitor->getFirstVisitAt(),`
	`128`	`+ 'VisitorTest failed to assert the time for the first visit within 5 seconds.',`
	`129`	`+ 5`
	`130`	`+ );`
`126`	`131`	`}`
`127`	`132`
`128`	`133`	`public function testGetLastVisitAt()`
`129`	`134`	`{`
`130`	`135`	`$time = time();`
`131`		`- $this->assertEquals($time, $this->visitor->getLastVisitAt());`
	`136`	`+ $this->assertEquals(`
	`137`	`+ $time,`
	`138`	`+ $this->visitor->getLastVisitAt(),`
	`139`	`+ 'VisitorTest failed to assert the time for the last visit within 5 seconds.',`
	`140`	`+ 5`
	`141`	`+ );`
`132`	`142`	`}`
`133`	`143`
`134`	`144`	`public function testLogNewVisitor()`