summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Baumbach <bb@sernet.de>2012-06-01 16:16:16 +0200
committerKai Blin <kai@samba.org>2012-06-21 21:55:20 +0200
commit09bee254f028368e59a462ab5d487546da6f940a (patch)
tree7f886b79d5cb34d2738aa9dcec6937ea4ad8c5d1
parent226dbc116da7eb59fd59a9fb8a88c05a13b74e05 (diff)
downloadsamba-09bee254f028368e59a462ab5d487546da6f940a.tar.gz
samba-09bee254f028368e59a462ab5d487546da6f940a.tar.bz2
samba-09bee254f028368e59a462ab5d487546da6f940a.zip
wintest: set nameserver on a more general place
Signed-off-by: Kai Blin <kai@samba.org>
-rwxr-xr-xwintest/test-s4-howto.py2
-rw-r--r--wintest/wintest.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py
index 110d65a057..01aac37115 100755
--- a/wintest/test-s4-howto.py
+++ b/wintest/test-s4-howto.py
@@ -581,6 +581,8 @@ def test_howto(t):
start_s4(t)
if not t.skip("smbclient"):
test_smbclient(t)
+
+ t.set_nameserver(t.getvar('INTERFACE_IP'))
if not t.skip("configure_bind2"):
t.configure_bind(kerberos_support=True, include='${PREFIX}/private/named.conf')
if not t.skip("start_bind"):
diff --git a/wintest/wintest.py b/wintest/wintest.py
index a6da60681e..f6993b2bd6 100644
--- a/wintest/wintest.py
+++ b/wintest/wintest.py
@@ -437,8 +437,6 @@ options {
self.info("Restarting bind9")
self.chdir('${PREFIX}')
- self.set_nameserver(self.getvar('INTERFACE_IP'))
-
self.run_cmd("mkdir -p var/named/data")
self.run_cmd("chown -R ${BIND_USER} var/named")