Revision e3cc4c69 test/ganeti.daemon_unittest.py

b/test/ganeti.daemon_unittest.py
28 28
import time
29 29

  
30 30
from ganeti import daemon
31
from ganeti import errors
31 32

  
32 33
import testutils
33 34

  
......
158 159

  
159 160
  def handle_error(self):
160 161
    self.error_count += 1
162
    raise
161 163

  
162 164

  
163 165
class TestAsyncUDPSocket(testutils.GanetiTestCase):
......
214 216
    self.client.enqueue_send("127.0.0.1", self.port, "p3")
215 217
    self.client.enqueue_send("127.0.0.1", self.port, "error")
216 218
    self.client.enqueue_send("127.0.0.1", self.port, "terminate")
219
    self.assertRaises(errors.GenericError, self.mainloop.Run)
220
    self.assertEquals(self.server.received,
221
                      ["p1", "p2", "error"])
222
    self.assertEquals(self.server.error_count, 1)
223
    self.assertRaises(errors.GenericError, self.mainloop.Run)
224
    self.assertEquals(self.server.received,
225
                      ["p1", "p2", "error", "p3", "error"])
226
    self.assertEquals(self.server.error_count, 2)
217 227
    self.mainloop.Run()
218 228
    self.assertEquals(self.server.received,
219 229
                      ["p1", "p2", "error", "p3", "error", "terminate"])

Also available in: Unified diff