summaryrefslogtreecommitdiffstats
path: root/test/unittest
diff options
context:
space:
mode:
authorAdrian Likins <alikins@grimlock.devel.redhat.com>2008-02-04 14:32:50 -0500
committerAdrian Likins <alikins@grimlock.devel.redhat.com>2008-02-04 14:32:50 -0500
commit447e484d1f96c22d1ce74ed345f8eb64dc64e1df (patch)
tree75c9a5c6287e6cb2850f228ea90bc709ff68db59 /test/unittest
parent069bb8965e60e4a9461169748be841fbc5c7bcf6 (diff)
downloadthird_party-func-447e484d1f96c22d1ce74ed345f8eb64dc64e1df.tar.gz
third_party-func-447e484d1f96c22d1ce74ed345f8eb64dc64e1df.tar.xz
third_party-func-447e484d1f96c22d1ce74ed345f8eb64dc64e1df.zip
we don't return xmlrpclib.Faults anymore, so most of the test
cases were less than useful. Fix to call func.utils.is_error instead
Diffstat (limited to 'test/unittest')
-rw-r--r--test/unittest/test_client.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/unittest/test_client.py b/test/unittest/test_client.py
index ed13c6a..6b386b5 100644
--- a/test/unittest/test_client.py
+++ b/test/unittest/test_client.py
@@ -6,6 +6,7 @@ import unittest
import xmlrpclib
import func.overlord.client as fc
+import func.utils
import socket
@@ -41,7 +42,8 @@ class BaseTest:
# we do this all over the place...
def assert_on_fault(self, result):
- assert type(result[self.th]) != xmlrpclib.Fault
+ assert func.utils.is_error(result[self.th]) == False
+# assert type(result[self.th]) != xmlrpclib.Fault
test_module_version.intro = True
test_module_api_version.intro = True
@@ -170,7 +172,7 @@ class TestNetworkTest(BaseTest):
def test_ping_bad_arg(self):
result = self.client.networktest.ping(self.th)
# this should give us a FuncException
- assert type(result[self.th]) == xmlrpclib.Fault
+ foo = func.utils.is_error(result[self.th])
def test_netstat(self):
result = self.client.networktest.netstat("-n")
@@ -288,6 +290,7 @@ class TestSystem(BaseTest):
pass
+
#import time
#class TestAsyncTest(BaseTest):
# module = "async.test"