From f98d9e06cfc9615834585864ed2348c63fb66adc Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 15 Dec 2010 14:57:43 +0100 Subject: Move get_loadparm() and get_credentials() to samba.tests.TestCase. --- source4/scripting/python/samba/tests/__init__.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'source4') diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py index 29016ea44c..10826ab483 100644 --- a/source4/scripting/python/samba/tests/__init__.py +++ b/source4/scripting/python/samba/tests/__init__.py @@ -29,10 +29,22 @@ import subprocess import tempfile # Other modules import these two classes from here, for convenience: -from testtools.testcase import TestCase, TestSkipped +from testtools.testcase import ( + TestCase as TesttoolsTestCase, + TestSkipped, + ) -class LdbTestCase(TestCase): +class TestCase(TesttoolsTestCase): + + def get_loadparm(self): + return env_loadparm() + + def get_credentials(self): + return cmdline_credentials + + +class LdbTestCase(TesttoolsTestCase): """Trivial test case for running tests against a LDB.""" def setUp(self): @@ -84,12 +96,7 @@ def env_get_var_value(var_name): cmdline_credentials = None class RpcInterfaceTestCase(TestCase): - - def get_loadparm(self): - return env_loadparm() - - def get_credentials(self): - return cmdline_credentials + """DCE/RPC Test case.""" class ValidNetbiosNameTests(TestCase): -- cgit