Nir Soffer has uploaded a new change for review.
Change subject: procwatch: Modernize and clarify helper name
......................................................................
procwatch: Modernize and clarify helper name
assertUnexpectedCall looks like an assert helper, but we use it as a
guarde to detect incorrect assumptions in the test. Rename to
unexpected_data, callback function that raise if unexpected data is
recevived.
Change-Id: Ia5375f57aebf977d9f78c01f1b25253d0a9b1675
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com>
---
M tests/procwatch_test.py
1 file changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/76/65076/1
diff --git a/tests/procwatch_test.py b/tests/procwatch_test.py
index 49181f5..d66d3ff 100644
--- a/tests/procwatch_test.py
+++ b/tests/procwatch_test.py
@@ -50,8 +50,8 @@
c = self.startCommand(cmd)
watcher = procwatch.ProcessWatcher(
c,
- recv_data if recv_out else self.assertUnexpectedCall,
- recv_data if recv_err else self.assertUnexpectedCall)
+ recv_data if recv_out else self.unexpected_data,
+ recv_data if recv_err else self.unexpected_data)
while not watcher.closed:
watcher.receive()
@@ -77,8 +77,8 @@
c = self.startCommand(cmd)
watcher = procwatch.ProcessWatcher(
c,
- recv_data if recv_out else self.assertUnexpectedCall,
- recv_data if recv_err else self.assertUnexpectedCall)
+ recv_data if recv_out else self.unexpected_data,
+ recv_data if recv_err else self.unexpected_data)
c.stdin.write(text)
c.stdin.flush()
@@ -94,8 +94,8 @@
def test_timeout(self):
c = self.startCommand(["sleep", "5"])
- watcher = procwatch.ProcessWatcher(c, self.assertUnexpectedCall,
- self.assertUnexpectedCall)
+ watcher = procwatch.ProcessWatcher(
+ c, self.unexpected_data, self.unexpected_data)
with self.assertElapsed(2):
watcher.receive(2)
@@ -112,8 +112,8 @@
))
def test_signals(self, method, expected_retcode):
c = self.startCommand(["sleep", "2"])
- watcher = procwatch.ProcessWatcher(c, self.assertUnexpectedCall,
- self.assertUnexpectedCall)
+ watcher = procwatch.ProcessWatcher(
+ c, self.unexpected_data, self.unexpected_data)
getattr(c, method)()
@@ -125,7 +125,7 @@
self.assertEqual(retcode, expected_retcode)
- def assertUnexpectedCall(self, data):
+ def unexpected_data(self, data):
raise AssertionError("Unexpected data: %r" % data)
def startCommand(self, command):
--
To view, visit
https://gerrit.ovirt.org/65076
To unsubscribe, visit
https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5375f57aebf977d9f78c01f1b25253d0a9b1675
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>