summaryrefslogtreecommitdiff
path: root/wintest
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-02-16 13:51:32 +1100
committerAndrew Bartlett <abartlet@samba.org>2012-02-16 15:20:09 +1100
commit032a2c4ce3ec275379b1de37dccb0040071254c4 (patch)
treeb40806a2df7a2ee3d2e35599d123879174638ee9 /wintest
parent00f86a36e076130c2c34a49b8dc820f34bf65d85 (diff)
downloadsamba-032a2c4ce3ec275379b1de37dccb0040071254c4.tar.gz
samba-032a2c4ce3ec275379b1de37dccb0040071254c4.tar.bz2
samba-032a2c4ce3ec275379b1de37dccb0040071254c4.zip
wintest: connect to correct hostname in test_net_use
Diffstat (limited to 'wintest')
-rwxr-xr-xwintest/test-s3.py4
-rw-r--r--wintest/wintest.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/wintest/test-s3.py b/wintest/test-s3.py
index 811e086dc1..1b9a26d480 100755
--- a/wintest/test-s3.py
+++ b/wintest/test-s3.py
@@ -232,7 +232,7 @@ def test_s3(t):
t.test_remote_smbclient('WINDOWS7', dom_username, dom_password, args='--option=clientntlmv2auth=no')
t.test_remote_smbclient('WINDOWS7', "%s@%s" % (dom_username, dom_realm), dom_password, args="-k")
t.test_remote_smbclient('WINDOWS7', "%s@%s" % (dom_username, dom_realm), dom_password, args="-k --option=clientusespnegoprincipal=yes")
- t.test_net_use('WINDOWS7', t.getvar("W2K8R2A_DOMAIN"), 'root', '${PASSWORD2}')
+ t.test_net_use('WINDOWS7', dom_realm, t.getvar("W2K8R2A_DOMAIN"), 'root', '${PASSWORD2}')
if t.have_var('WINXP_VM') and t.have_var('W2K8R2A_VM') and not t.skip("join_winxp_2008r2"):
if not dc_started:
@@ -251,7 +251,7 @@ def test_s3(t):
t.test_remote_smbclient('WINXP', dom_username, dom_password, args='--option=clientntlmv2auth=no')
t.test_remote_smbclient('WINXP', "%s@%s" % (dom_username, dom_realm), dom_password, args="-k")
t.test_remote_smbclient('WINXP', "%s@%s" % (dom_username, dom_realm), dom_password, args="-k --clientusespnegoprincipal=yes")
- t.test_net_use('WINXP', t.getvar("W2K8R2A_DOMAIN"), 'root', '${PASSWORD2}')
+ t.test_net_use('WINXP', dom_realm, t.getvar("W2K8R2A_DOMAIN"), 'root', '${PASSWORD2}')
t.info("S3 test: All OK")
diff --git a/wintest/wintest.py b/wintest/wintest.py
index d5728a883b..325da964e2 100644
--- a/wintest/wintest.py
+++ b/wintest/wintest.py
@@ -845,11 +845,11 @@ RebootOnCompletion=No
self.cmd_contains("bin/smbclient --version", ["${SAMBA_VERSION}"])
self.retry_cmd('bin/smbclient -L ${WIN_HOSTNAME} -U%s%%%s %s' % (username, password, args), ["IPC"])
- def test_net_use(self, vm, domain, username, password):
+ def test_net_use(self, vm, realm, domain, username, password):
self.setwinvars(vm)
self.info('Testing net use against Samba3 member')
child = self.open_telnet("${WIN_HOSTNAME}", "%s\\%s" % (domain, username), password)
- child.sendline("net use t: \\\\${HOSTNAME}.${LCREALM}\\test")
+ child.sendline("net use t: \\\\${HOSTNAME}.%s\\test" % realm)
child.expect("The command completed successfully")