Commit 84ce674e authored by Iustin Pop's avatar Iustin Pop
Browse files

asyncnotifier tests: simplify the setup code



First change is to replace "range(len(self.NOTIFIERS)))" with
self.NOTIFIERS, as range(len(range(N))) ≡ range(N).

Sencond change is switch from an explicit indexing to use of zip.
Unittests still pass :)
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parent 88a32957
......@@ -64,15 +64,12 @@ class TestSingleFileEventHandler(testutils.GanetiTestCase):
# We need one watch manager per notifier, as those contain the file
# descriptor which is monitored by asyncore
self.wms = [pyinotify.WatchManager() for i in self.NOTIFIERS]
self.cbk = [self.OnInotifyCallback(self, i)
for i in range(len(self.NOTIFIERS))]
self.ihandler = [asyncnotifier.SingleFileEventHandler(self.wms[i],
self.cbk[i],
self.chk_files[i])
for i in range(len(self.NOTIFIERS))]
self.notifiers = [_MyErrorLoggingAsyncNotifier(self.wms[i],
self.ihandler[i])
for i in range(len(self.NOTIFIERS))]
self.cbk = [self.OnInotifyCallback(self, i) for i in self.NOTIFIERS]
self.ihandler = [asyncnotifier.SingleFileEventHandler(wm, cb, cf)
for (wm, cb, cf) in
zip(self.wms, self.cbk, self.chk_files)]
self.notifiers = [_MyErrorLoggingAsyncNotifier(wm, ih)
for (wm, ih) in zip(self.wms, self.ihandler)]
# TERM notifier is enabled by default, as we use it to get out of the loop
self.ihandler[self.NOTIFIER_TERM].enable()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment