[py-svn] r57151 - in py/branch/event/py/test2: dist/testing rep

[hpk at codespeak.net]

Author: hpk
Date: Sat Aug  9 20:38:25 2008
New Revision: 57151

Modified:
   py/branch/event/py/test2/dist/testing/test_async.py
   py/branch/event/py/test2/rep/terminal.py
Log:
split tests


Modified: py/branch/event/py/test2/dist/testing/test_async.py
==============================================================================
--- py/branch/event/py/test2/dist/testing/test_async.py	(original)
+++ py/branch/event/py/test2/dist/testing/test_async.py	Sat Aug  9 20:38:25 2008
@@ -110,20 +110,32 @@
         assert exitstatus == session.EXIT_OK 
         assert host1.node.sent == [[item]]
 
-    def test_hostdown(self):
+    def test_no_hosts_remaining_for_tests(self):
         item = self.getitem("def test_func(): pass")
+        # setup a session with one host
         session = AsyncSession(item._config)
         host1 = Host("localhost")
         host1.node = MockNode()
         session.addhost(host1)
+       
+        # setup a HostDown event
         ev = repevent.HostDown(host1, None)
         session.queue.put(ev)
+        exitstatus = session.loop([item])
+        dumpqueue(session.queue)
+        assert exitstatus == session.EXIT_NOHOSTS
+
+    def test_event_propagation(self):
+        item = self.getitem("def test_func(): pass")
+        session = AsyncSession(item._config)
         events = []
         session.bus.subscribe(events.append)
+        ev = repevent.HostDown(Host("localhost"), None)
+        session.queue.put(ev)
         exitstatus = session.loop([item])
-        dumpqueue(session.queue)
         assert events[0] == ev  # this tests event propagation
-        assert exitstatus == session.EXIT_NOHOSTS
+        # the host that we signalled wasn't added 
+        assert exitstatus == session.EXIT_INTERNALERROR 
 
     def runthrough(self, item):
         session = AsyncSession(item._config)

Modified: py/branch/event/py/test2/rep/terminal.py
==============================================================================
--- py/branch/event/py/test2/rep/terminal.py	(original)
+++ py/branch/event/py/test2/rep/terminal.py	Sat Aug  9 20:38:25 2008
@@ -41,9 +41,7 @@
         host = ev.host
         error = ev.error
         if error:
-            self.write_line("HostDown %s: " %(host.hostid, ))
-            for line in str(error).split("\n"):
-                self.write_line("Error: %s" %(line))
+            self.write_line("HostDown %s: %s" %(host.hostid, error))
     
     def rep_ItemTestReport(self, ev):
         super(TerminalReporter, self).rep_ItemTestReport(ev)