From b45b6b6707de9e4518d99c58b0a0bf7d886971b7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 20 Feb 2017 09:16:02 +0100 Subject: [PATCH] Import: we now skip messages when user is null --- src/Wallabag/ImportBundle/Consumer/AbstractConsumer.php | 3 ++- .../Wallabag/ImportBundle/Consumer/AMQPEntryConsumerTest.php | 4 +++- .../Wallabag/ImportBundle/Consumer/RedisEntryConsumerTest.php | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Wallabag/ImportBundle/Consumer/AbstractConsumer.php b/src/Wallabag/ImportBundle/Consumer/AbstractConsumer.php index fc175f67..992ce1ad 100644 --- a/src/Wallabag/ImportBundle/Consumer/AbstractConsumer.php +++ b/src/Wallabag/ImportBundle/Consumer/AbstractConsumer.php @@ -46,7 +46,8 @@ abstract class AbstractConsumer if (null === $user) { $this->logger->warning('Unable to retrieve user', ['entry' => $storedEntry]); - return false; + // return true to skip message + return true; } $this->import->setUser($user); diff --git a/tests/Wallabag/ImportBundle/Consumer/AMQPEntryConsumerTest.php b/tests/Wallabag/ImportBundle/Consumer/AMQPEntryConsumerTest.php index 856954a6..a989ec7f 100644 --- a/tests/Wallabag/ImportBundle/Consumer/AMQPEntryConsumerTest.php +++ b/tests/Wallabag/ImportBundle/Consumer/AMQPEntryConsumerTest.php @@ -183,7 +183,9 @@ JSON; $message = new AMQPMessage($body); - $consumer->execute($message); + $res = $consumer->execute($message); + + $this->assertTrue($res); } public function testMessageWithEntryProcessed() diff --git a/tests/Wallabag/ImportBundle/Consumer/RedisEntryConsumerTest.php b/tests/Wallabag/ImportBundle/Consumer/RedisEntryConsumerTest.php index 3b92f759..78bd83ba 100644 --- a/tests/Wallabag/ImportBundle/Consumer/RedisEntryConsumerTest.php +++ b/tests/Wallabag/ImportBundle/Consumer/RedisEntryConsumerTest.php @@ -182,7 +182,7 @@ JSON; $res = $consumer->manage($body); - $this->assertFalse($res); + $this->assertTrue($res); } public function testMessageWithEntryProcessed() -- 2.41.0