diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-12-15 14:57:43 +0100 | 
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-12-15 14:57:43 +0100 | 
| commit | f98d9e06cfc9615834585864ed2348c63fb66adc (patch) | |
| tree | 1b38f0b04f70ec0061d8ffff8538e7fb50c8de03 | |
| parent | 8b47fcea043086e4ec7abbc4d4394f69caac08d0 (diff) | |
| download | samba-f98d9e06cfc9615834585864ed2348c63fb66adc.tar.gz samba-f98d9e06cfc9615834585864ed2348c63fb66adc.tar.bz2 samba-f98d9e06cfc9615834585864ed2348c63fb66adc.zip  | |
Move get_loadparm() and get_credentials() to samba.tests.TestCase.
| -rw-r--r-- | source4/scripting/python/samba/tests/__init__.py | 23 | 
1 files changed, 15 insertions, 8 deletions
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):  | 
