From: Jelmer Vernooij Date: Mon, 15 Dec 2014 17:35:24 +0000 (+0000) Subject: Fix use of TestCase.skipTest on python2.6 now that we no longer use testtools. X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=85c1dc99083598339050ab5326ba9e0766eacdc8;p=obnox%2Fsamba%2Fsamba-obnox.git Fix use of TestCase.skipTest on python2.6 now that we no longer use testtools. Change-Id: I630e4073bf1553dfc77e9fe7e843ee8b71907683 Signed-off-by: Jelmer Vernooij Reviewed-by: Andrew Bartlett --- diff --git a/python/samba/tests/__init__.py b/python/samba/tests/__init__.py index 25de135a990..d85260c3066 100644 --- a/python/samba/tests/__init__.py +++ b/python/samba/tests/__init__.py @@ -53,6 +53,10 @@ class TestCase(unittest.TestCase): def get_credentials(self): return cmdline_credentials + if not getattr(unittest.TestCase, "skipTest", None): + def skipTest(self, reason): + raise SkipTest(reason) + class LdbTestCase(unittest.TestCase): """Trivial test case for running tests against a LDB.""" diff --git a/python/samba/tests/dcerpc/srvsvc.py b/python/samba/tests/dcerpc/srvsvc.py index 3206a27e678..407a9d52a73 100644 --- a/python/samba/tests/dcerpc/srvsvc.py +++ b/python/samba/tests/dcerpc/srvsvc.py @@ -45,12 +45,12 @@ class SrvsvcTests(RpcInterfaceTestCase): return share def test_NetShareAdd(self): - self.skip("Dangerous test") + self.skipTest("Dangerous test") share = self.getDummyShareObject() self.conn.NetShareAdd(self.server_unc, 2, share, None) def test_NetShareSetInfo(self): - self.skip("Dangerous test") + self.skipTest("Dangerous test") share = self.getDummyShareObject() parm_error = 0x00000000 self.conn.NetShareAdd(self.server_unc, 502, share, parm_error) @@ -60,7 +60,7 @@ class SrvsvcTests(RpcInterfaceTestCase): 502, share, parm_error) def test_NetShareDel(self): - self.skip("Dangerous test") + self.skipTest("Dangerous test") share = self.getDummyShareObject() parm_error = 0x00000000 self.expectFailure("NetShareAdd doesn't work properly from Python",