diff options
| author | Michael Adam <obnox@samba.org> | 2012-05-30 15:22:52 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-05-31 18:23:42 +1000 |
| commit | f866755015352d925955d1de6c1b7b0c4212d874 (patch) | |
| tree | f1328d0af6d2910427f8e669a553420d8743a85d /wintest/wintest.py | |
| parent | 835e25e3b41dbdac8f0e94e3b983fde771213389 (diff) | |
| download | samba-f866755015352d925955d1de6c1b7b0c4212d874.tar.gz samba-f866755015352d925955d1de6c1b7b0c4212d874.tar.bz2 samba-f866755015352d925955d1de6c1b7b0c4212d874.zip | |
wintest: introduce a variable to contain the (relative) path of smbclient
Diffstat (limited to 'wintest/wintest.py')
| -rw-r--r-- | wintest/wintest.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/wintest/wintest.py b/wintest/wintest.py index c35710a8ec..36711d947e 100644 --- a/wintest/wintest.py +++ b/wintest/wintest.py @@ -878,8 +878,9 @@ RebootOnCompletion=No self.setwinvars(vm) self.info('Testing smbclient') self.chdir('${PREFIX}') - self.cmd_contains("bin/smbclient --version", ["${SAMBA_VERSION}"]) - self.retry_cmd('bin/smbclient -L ${WIN_HOSTNAME} -U%s%%%s %s' % (username, password, args), ["IPC"], retries=60, delay=5) + smbclient = self.getvar("smbclient") + self.cmd_contains("%s --version" % (smbclient), ["${SAMBA_VERSION}"]) + self.retry_cmd('%s -L ${WIN_HOSTNAME} -U%s%%%s %s' % (smbclient, username, password, args), ["IPC"], retries=60, delay=5) def test_net_use(self, vm, realm, domain, username, password): self.setwinvars(vm) |