From ff284cb12f7e53d38f1bf66bffe9a1f50b97a7be Mon Sep 17 00:00:00 2001 From: Rostislav Wolny Date: Thu, 18 Feb 2021 16:56:38 +0100 Subject: [PATCH] Fix flaky Import test Comparing timestamps with delta parameter allow values that differs by 1 second. [MAILPOET-3412] --- .../Subscribers/ImportExport/Import/ImportTest.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/integration/Subscribers/ImportExport/Import/ImportTest.php b/tests/integration/Subscribers/ImportExport/Import/ImportTest.php index 87e01da85a..c82dce5a3d 100644 --- a/tests/integration/Subscribers/ImportExport/Import/ImportTest.php +++ b/tests/integration/Subscribers/ImportExport/Import/ImportTest.php @@ -65,8 +65,8 @@ class ImportTest extends \MailPoetTest { $this->subscriberRepository = $this->diContainer->get(SubscribersRepository::class); $this->subscriberSegmentRepository = $this->diContainer->get(SubscriberSegmentRepository::class); $customField = $this->customFieldsRepository->createOrUpdate([ - 'name' => 'country', - 'type' => CustomFieldEntity::TYPE_TEXT, + 'name' => 'country', + 'type' => CustomFieldEntity::TYPE_TEXT, ]); assert($customField instanceof CustomFieldEntity); $this->subscribersCustomFields = [$customField->getId()]; @@ -501,9 +501,12 @@ class ImportTest extends \MailPoetTest { expect($newSubscribers[1]->getSource())->equals('imported'); expect(strlen((string)$newSubscribers[0]->getLinkToken()))->equals(SubscriberEntity::LINK_TOKEN_LENGTH); expect(strlen((string)$newSubscribers[1]->getLinkToken()))->equals(SubscriberEntity::LINK_TOKEN_LENGTH); - $testTime = Carbon::createFromTimestamp($this->testData['timestamp']); - expect($newSubscribers[0]->getLastSubscribedAt())->equals($testTime); - expect($newSubscribers[1]->getLastSubscribedAt())->equals($testTime); + $lastSubscribed1 = $newSubscribers[0]->getLastSubscribedAt(); + $lastSubscribed2 = $newSubscribers[1]->getLastSubscribedAt(); + assert($lastSubscribed1 instanceof \DateTimeInterface); + assert($lastSubscribed2 instanceof \DateTimeInterface); + expect($lastSubscribed1->getTimestamp())->equals($this->testData['timestamp'], 1); + expect($lastSubscribed2->getTimestamp())->equals($this->testData['timestamp'], 1); } public function testItDoesNotUpdateExistingSubscribersLastSubscribedAtWhenItIsPresent() {