Merge branch 'MAGETWO-35602' into BUGS

Author: AndriyNasinnyk

app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php

@@ -165,6 +165,14 @@ public function testGetStoreLastLoginDateTimezone()
      */
     public function testGetCurrentStatus($status, $lastLoginAt, $lastVisitAt, $lastLogoutAt)
     {
+        $this->scopeConfig->expects($this->any())
+            ->method('getValue')
+            ->with(
+                'customer/online_customers/online_minutes_interval',
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            )
+            ->willReturn(60); //TODO: it's value mocked because unit tests run data providers before all testsuite
+
         $this->customerLog->expects($this->any())->method('getLastLoginAt')->willReturn($lastLoginAt);
         $this->customerLog->expects($this->any())->method('getLastVisitAt')->willReturn($lastVisitAt);
         $this->customerLog->expects($this->any())->method('getLastLogoutAt')->willReturn($lastLogoutAt);

lib/internal/Magento/Framework/App/Test/Unit/View/Deployment/VersionTest.php

@@ -40,7 +40,7 @@ public function testGetValueDeveloperMode()
             ->method('getMode')
             ->will($this->returnValue(\Magento\Framework\App\State::MODE_DEVELOPER));
         $this->versionStorage->expects($this->never())->method($this->anything());
-        $this->assertEquals(time(), $this->object->getValue());
+        $this->assertEquals(time(), $this->object->getValue(), '', 5);
         $this->object->getValue(); // Ensure computation occurs only once and result is cached in memory
     }