diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-06-13 16:38:24 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-06-13 18:19:03 +0200 |
| commit | 51058213cb183bcb127f5bb275cbb781efc55e35 (patch) | |
| tree | cdf9394eaba7e5ab2e784cd18518770469f99075 /source4/scripting/python/samba/tests/dcerpc | |
| parent | 46037a816091506c4c89df6141d57b281728b395 (diff) | |
| download | samba-51058213cb183bcb127f5bb275cbb781efc55e35.tar.gz samba-51058213cb183bcb127f5bb275cbb781efc55e35.tar.bz2 samba-51058213cb183bcb127f5bb275cbb781efc55e35.zip | |
s4-test: Use smb.conf path set in environment rather than using
command-line options.
This is the first step towards supporting custom test runners.
Diffstat (limited to 'source4/scripting/python/samba/tests/dcerpc')
| -rw-r--r-- | source4/scripting/python/samba/tests/dcerpc/bare.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/scripting/python/samba/tests/dcerpc/bare.py b/source4/scripting/python/samba/tests/dcerpc/bare.py index 6cadad89f1b..e6811b0a3d8 100644 --- a/source4/scripting/python/samba/tests/dcerpc/bare.py +++ b/source4/scripting/python/samba/tests/dcerpc/bare.py @@ -20,7 +20,7 @@ from samba.dcerpc import ClientConnection from unittest import TestCase -from samba.tests import cmdline_loadparm +from samba.tests import env_loadparm class BareTestCase(TestCase): @@ -28,22 +28,22 @@ class BareTestCase(TestCase): def test_bare(self): # Connect to the echo pipe x = ClientConnection("ncalrpc:localhost[DEFAULT]", - ("60a15ec5-4de8-11d7-a637-005056a20182", 1), lp_ctx=cmdline_loadparm) + ("60a15ec5-4de8-11d7-a637-005056a20182", 1), lp_ctx=env_loadparm()) self.assertEquals("\x01\x00\x00\x00", x.request(0, chr(0) * 4)) def test_alter_context(self): x = ClientConnection("ncalrpc:localhost[DEFAULT]", - ("12345778-1234-abcd-ef00-0123456789ac", 1), lp_ctx=cmdline_loadparm) + ("12345778-1234-abcd-ef00-0123456789ac", 1), lp_ctx=env_loadparm()) y = ClientConnection("ncalrpc:localhost", ("60a15ec5-4de8-11d7-a637-005056a20182", 1), - basis_connection=x, lp_ctx=cmdline_loadparm) + basis_connection=x, lp_ctx=env_loadparm()) x.alter_context(("60a15ec5-4de8-11d7-a637-005056a20182", 1)) # FIXME: self.assertEquals("\x01\x00\x00\x00", x.request(0, chr(0) * 4)) def test_two_connections(self): x = ClientConnection("ncalrpc:localhost[DEFAULT]", - ("60a15ec5-4de8-11d7-a637-005056a20182", 1), lp_ctx=cmdline_loadparm) + ("60a15ec5-4de8-11d7-a637-005056a20182", 1), lp_ctx=env_loadparm()) y = ClientConnection("ncalrpc:localhost", ("60a15ec5-4de8-11d7-a637-005056a20182", 1), - basis_connection=x, lp_ctx=cmdline_loadparm) + basis_connection=x, lp_ctx=env_loadparm()) self.assertEquals("\x01\x00\x00\x00", y.request(0, chr(0) * 4)) |