python/samba/tests: move hexdump() from DNSTest to TestCase

This is useful in a lot of test cases.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>

diff --git a/python/samba/tests/__init__.py b/python/samba/tests/__init__.py
index 3e7094fe067f1cef5f138685b3b64e7b9e0e0880..984b1bf0660fc97f0ad4eb3243217e144f55a43c 100644 (file)
--- a/python/samba/tests/__init__.py
+++ b/python/samba/tests/__init__.py
@@ -35,6 +35,7 @@ except ImportError:
     class SkipTest(Exception):
         """Test skipped."""
 
+HEXDUMP_FILTER=''.join([(len(repr(chr(x)))==3) and chr(x) or '.' for x in range(256)])
 
 class TestCase(unittest.TestCase):
     """A Samba test case."""
@@ -54,6 +55,17 @@ class TestCase(unittest.TestCase):
     def get_credentials(self):
         return cmdline_credentials
 
+    def hexdump(self, src, length=8):
+        N = 0
+        result = ''
+        while src:
+            s, src = src[:length], src[length:]
+            hexa = ' '.join(["%02X" % ord(x) for x in s])
+            s = s.translate(HEXDUMP_FILTER)
+            result += "%04X   %-*s   %s\n" % (N, length*3, hexa, s)
+            N += length
+        return result
+
     # These functions didn't exist before Python2.7:
     if sys.version_info < (2, 7):
         import warnings

diff --git a/python/samba/tests/dns.py b/python/samba/tests/dns.py
index 92ac876ff356402a7777751b501f08f6d64b900a..04ac3567ed7dfdce6ed60f2e483cc382dcffe94c 100644 (file)
--- a/python/samba/tests/dns.py
+++ b/python/samba/tests/dns.py
@@ -25,8 +25,6 @@ from samba import credentials, param
 from samba.tests import TestCase
 from samba.dcerpc import dnsp, dnsserver
 
-FILTER=''.join([(len(repr(chr(x)))==3) and chr(x) or '.' for x in range(256)])
-
 
 class DNSTest(TestCase):
 
@@ -125,18 +123,6 @@ class DNSTest(TestCase):
                 if s is not None:
                     s.close()
 
-    def hexdump(self, src, length=8):
-        N = 0
-        result = ''
-        while src:
-            s, src = src[:length], src[length:]
-            hexa = ' '.join(["%02X" % ord(x) for x in s])
-            s = s.translate(FILTER)
-            result += "%04X   %-*s   %s\n" % (N, length*3, hexa, s)
-            N += length
-        return result
-
-
 class TestSimpleQueries(DNSTest):
 
     def test_one_a_query(self):