Merge pull request #120 from moreati/testloaf

WIP: Miscellaneous test suite fixes

test.sh

@@ -13,10 +13,6 @@ while time.time() < deadline and proc.poll() is None:
     time.sleep(1.0)
 
 if proc.poll() is not None:
-    if proc.returncode:
-        print
-        print >> sys.stderr, "Command failed:", sys.argv[2:]
-        print
     sys.exit(proc.returncode)
 proc.terminate()
 print
@@ -26,18 +22,7 @@ sys.exit(1)
     ' "$@"
 }
 
-timeout 05.0 python tests/call_function_test.py
-timeout 05.0 python tests/channel_test.py
-timeout 05.0 python tests/first_stage_test.py
-timeout 05.0 python tests/id_allocation_test.py
-timeout 05.0 python tests/importer_test.py
-timeout 05.0 python tests/local_test.py
-timeout 05.0 python tests/master_test.py
-timeout 05.0 python tests/module_finder_test.py
-timeout 05.0 python tests/nested_test.py
-timeout 05.0 python tests/parent_test.py
-timeout 05.0 python tests/responder_test.py
-timeout 05.0 python tests/utils_test.py
-timeout 20.0 python tests/select_test.py
-timeout 20.0 python tests/ssh_test.py
-timeout 30.0 python tests/fakessh_test.py
+for f in tests/*_test.py; do
+    echo $f
+    timeout 10 python $f
+done

tests/ansible_helpers_test.py

@@ -6,7 +6,7 @@ import testlib
 
 
 class ApplyModeSpecTest(unittest2.TestCase):
-    func = staticmethod(ansible_mitogen.apply_mode_spec)
+    func = staticmethod(ansible_mitogen.helpers.apply_mode_spec)
 
     def test_simple(self):
         spec = 'u+rwx,go=x'

tests/responder_test.py

@@ -78,7 +78,7 @@ class BrokenModulesTest(unittest2.TestCase):
         self.assertIsInstance(msg.unpickle(), tuple)
 
 
-class BlacklistTest(unittest.TestCase):
+class BlacklistTest(unittest2.TestCase):
     def test_whitelist_no_blacklist(self):
         assert 0