sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-29 15:42:04 +03:00
Code Activity

pytestrpc: Be more verbose.

Browse Source
This commit is contained in:
Jelmer Vernooij
2010-09-20 21:04:04 -07:00
parent c4c6f8f175
commit 7fc40d2ed3
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source4/scripting/python/samba/tests/dcerpc/testrpc.py
View File

@ -57,7 +57,7 @@ class RpcTests(object):
print "Setting %s.%s" % (typename, n)
setattr(v, n, value)
except Exception, e:
if issubclass(e, AttributeError) and str(e).endswith("is read-only"):
if isinstance(e, AttributeError) and str(e).endswith("is read-only"):
# readonly, ignore
continue
else:
@ -68,7 +68,7 @@ class RpcTests(object):
# and try a comparison
try:
if value != getattr(v, n):
print "ERROR: Comparison failed for %s.%s != %r" % (typename, n, value)
print "ERROR: Comparison failed for %s.%s: %r != %r" % (typename, n, value, getattr(v, n))
continue
except Exception, e:
print "ERROR: compare exception for %s.%s: %r: %s" % (typename, n, e.__class__, e)
@ -92,9 +92,11 @@ class RpcTests(object):
initial_blocks = samba.talloc_total_blocks(None)
self.check_type(interface, n, value)
self.check_blocks(None, initial_blocks)
except:
print "ERROR: Failed to check_type %s.%s" % (iname, n)
except Exception, e:
print "ERROR: Failed to check_type %s.%s: %r: %s" % (iname, n, e.__class__, e)
self.errcount += 1
elif callable(value):
pass # Method
else:
print "UNKNOWN: %s=%s" % (n, value)
if self.errcount - errcount != 0: