Merge lp:~eeejay/mago/tweaks into lp:~mago-contributors/mago/mago-1.0

[Eitan Isaacson]

[Ara Pulido (ara)]

The hierarchy with TestRunner -- TestSuiteRunnre, TestcaseRunner proved as a good design decision ;-)
Approved.

review: Approve

=== modified file 'bin/ubuntu-desktop-test'
--- bin/ubuntu-desktop-test	2009-04-29 15:08:39 +0000
+++ bin/ubuntu-desktop-test	2009-05-05 09:08:13 +0000
@@ -308,6 +308,14 @@
 class TestRunner:
     def __init__(self):
         self.result = {}
+        self.args = {}
+
+    def get_args(self, node):
+        for n in node.childNodes:
+            if n.nodeType != n.ELEMENT_NODE or not n.hasChildNodes():
+                continue
+            self.args[n.tagName.encode('ascii')] = n.firstChild.data
+
     def add_results_to_node(self, node):
         if self.result == {}: return
         result = node.ownerDocument.createElement("result")
@@ -344,19 +352,12 @@
     def __init__(self, obj, xml_node):
         TestRunner.__init__(self)
         self.xml_node = xml_node
-        self.args = {}
         self.name = xml_node.getAttribute('name')
         self.test_func = getattr(
             obj, xml_node.getElementsByTagName('method')[0].firstChild.data)
         args_element = xml_node.getElementsByTagName('args')
         if args_element:
-            self._get_args(args_element[0])
-
-    def _get_args(self, node):
-        for n in node.childNodes:
-            if n.nodeType != n.ELEMENT_NODE or not n.hasChildNodes():
-                continue
-            self.args[n.tagName.encode('ascii')] = n.firstChild.data
+            self.get_args(args_element[0])
 
     def run(self, logger):
         starttime = time()
@@ -411,9 +412,12 @@
                 continue
             if node.tagName == 'class':
                 modname, clsname = node.firstChild.data.rsplit('.', 1)
-            if node.tagName == 'case':
-                logging.debug("Adding case %s to current test suite.", node.getAttribute("name"))
+            elif node.tagName == 'case':
+                logging.debug("Adding case %s to current test suite.", 
+                              node.getAttribute("name"))
                 case_runners.append(node)
+            elif node.tagName == 'args':
+                self.get_args(node)
         if None in (clsname, modname):
             raise Exception, "Missing a suite class"
 
@@ -425,7 +429,7 @@
 
         cls = getattr(mod, clsname)
         
-        self.testsuite = cls()
+        self.testsuite = cls(**self.args)
         
         self.case_runners = \
             [TestCaseRunner(self.testsuite, c) for c in case_runners]