diff options
author | Erik Olof Gunnar Andersson <eandersson@blizzard.com> | 2019-06-28 11:03:40 -0700 |
---|---|---|
committer | Erik Olof Gunnar Andersson <eandersson@blizzard.com> | 2019-06-28 11:03:40 -0700 |
commit | 1f97fab5de52667a17f41fe144e241449e853bda (patch) | |
tree | df237d37b356acce7e1c9335327cac9937267775 | |
parent | 08684a2c8e1f33362e142ae6e50f5067e9424860 (diff) | |
download | designate-1f97fab5de52667a17f41fe144e241449e853bda.tar.gz |
Add some additional logging for failing task test
Change-Id: If81186c42f522a4d429b492e22ad66388fc25a5f
-rw-r--r-- | designate/producer/tasks.py | 11 | ||||
-rw-r--r-- | 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 87d56edf..81dca0c3 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 1d870aaa..0ad1ca50 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 + ) |