From 1f97fab5de52667a17f41fe144e241449e853bda Mon Sep 17 00:00:00 2001
From: Erik Olof Gunnar Andersson <eandersson@blizzard.com>
Date: Fri, 28 Jun 2019 11:03:40 -0700
Subject: [PATCH] Add some additional logging for failing task test

Change-Id: If81186c42f522a4d429b492e22ad66388fc25a5f
---
 designate/producer/tasks.py                 | 11 ++++++-----
 designate/tests/test_producer/test_tasks.py | 12 +++++++++++-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/designate/producer/tasks.py b/designate/producer/tasks.py
index 87d56edf9..81dca0c36 100644
--- a/designate/producer/tasks.py
+++ b/designate/producer/tasks.py
@@ -263,12 +263,13 @@ class PeriodicGenerateDelayedNotifyTask(PeriodicTask):
                 'start': pstart,
                 'end': pend,
                 'n': len(zones)
-            })
+            }
+        )
 
-        for z in zones:
-            self.zone_api.update_zone(ctxt, z)
-            z.delayed_notify = False
-            self.central_api.update_zone(ctxt, z)
+        for zone in zones:
+            self.zone_api.update_zone(ctxt, zone)
+            zone.delayed_notify = False
+            self.central_api.update_zone(ctxt, zone)
 
 
 class WorkerPeriodicRecovery(PeriodicTask):
diff --git a/designate/tests/test_producer/test_tasks.py b/designate/tests/test_producer/test_tasks.py
index 1d870aaad..0ad1ca509 100644
--- a/designate/tests/test_producer/test_tasks.py
+++ b/designate/tests/test_producer/test_tasks.py
@@ -114,6 +114,10 @@ class PeriodicGenerateDelayedNotifyTaskTest(TestCase):
             )
         )
 
+    def _fetch_all_zones(self):
+        # Fetch all zones including deleted ones.
+        return self._fetch_zones(tables.zones.select())
+
     def _fetch_zones(self, query):
         # Fetch zones including deleted ones.
         return self.central_service.storage.session.execute(query).fetchall()
@@ -132,6 +136,9 @@ class PeriodicGenerateDelayedNotifyTaskTest(TestCase):
         # Create zones and set some of them as pending update.
         self._create_zones()
 
+        zones = self._fetch_all_zones()
+        self.assertEqual(self.number_of_zones, len(zones))
+
         for remaining in reversed(range(0,
                                         self.number_of_zones // 2,
                                         self.batch_size)):
@@ -140,4 +147,7 @@ class PeriodicGenerateDelayedNotifyTaskTest(TestCase):
             zones = self._fetch_zones(tables.zones.select().where(
                 tables.zones.c.delayed_notify))
 
-            self.assertEqual(remaining, len(zones))
+            self.assertEqual(
+                remaining, len(zones),
+                message='Remaining zones: %s' % zones
+            )