From aa567a18545e321fa479635e01e423ca16884450 Mon Sep 17 00:00:00 2001 From: fawce Date: Wed, 29 Feb 2012 11:08:25 -0500 Subject: [PATCH] clearing unit test references from client. --- setup.cfg | 12 ++++++------ zipline/test/client.py | 8 +++----- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/setup.cfg b/setup.cfg index 517174ae..c64d493c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,12 +2,12 @@ verbosity=2 detailed-errors=1 -with-xcoverage=1 -cover-package=zipline -cover-erase=1 -cover-html=1 -cover-html-dir=docs/_build/html/cover -with-xunit=1 +#with-xcoverage=1 +#cover-package=zipline +#cover-erase=1 +#cover-html=1 +#cover-html-dir=docs/_build/html/cover +#with-xunit=1 #processes=2 diff --git a/zipline/test/client.py b/zipline/test/client.py index 33b9bf29..59e4d785 100644 --- a/zipline/test/client.py +++ b/zipline/test/client.py @@ -8,11 +8,10 @@ import zipline.protocol as zp class TestClient(qmsg.Component): """no-op client - Just connects to the merge and counts messages. compares received message count to the expected count.""" - def __init__(self, utest, expected_msg_count=0): + def __init__(self, expected_msg_count=0): qmsg.Component.__init__(self) self.received_count = 0 self.expected_msg_count = expected_msg_count - self.utest = utest self.prev_dt = None self.heartbeat_timeout = 2000 @@ -32,9 +31,8 @@ class TestClient(qmsg.Component): if msg == str(zp.CONTROL_PROTOCOL.DONE): qutil.LOGGER.info("Client is DONE!") self.signal_done() - self.utest.assertEqual(self.expected_msg_count, self.received_count, - "The client should have received ({n}) the same number of messages as the feed sent ({m})." - .format(n=self.received_count, m=self.expected_msg_count)) + if(self.expected_msg_count > 0): + assert self.received_count == self.expected_msg_count return self.received_count += 1