diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2014-12-15 17:35:24 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2015-03-06 04:41:48 +0100 |
| commit | 85c1dc99083598339050ab5326ba9e0766eacdc8 (patch) | |
| tree | 55281f299404b6d02419f00f37cfb05c6183b630 /python/samba | |
| parent | bd13405e8570e9a5942165a8c52a2bc3fdc9d96e (diff) | |
| download | samba-85c1dc99083598339050ab5326ba9e0766eacdc8.tar.gz samba-85c1dc99083598339050ab5326ba9e0766eacdc8.tar.xz samba-85c1dc99083598339050ab5326ba9e0766eacdc8.zip | |
Fix use of TestCase.skipTest on python2.6 now that we no longer use testtools.
Change-Id: I630e4073bf1553dfc77e9fe7e843ee8b71907683
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'python/samba')
| -rw-r--r-- | python/samba/tests/__init__.py | 4 | ||||
| -rw-r--r-- | python/samba/tests/dcerpc/srvsvc.py | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/python/samba/tests/__init__.py b/python/samba/tests/__init__.py index 25de135a99..d85260c306 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 3206a27e67..407a9d52a7 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", |