wintest: set nameserver on a more general place
authorBjörn Baumbach <bb@sernet.de>
Fri, 1 Jun 2012 14:16:16 +0000 (16:16 +0200)
committerKai Blin <kai@samba.org>
Thu, 21 Jun 2012 19:55:20 +0000 (21:55 +0200)
Signed-off-by: Kai Blin <kai@samba.org>
wintest/test-s4-howto.py
wintest/wintest.py

index 110d65a..01aac37 100755 (executable)
@@ -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"):
index a6da606..f6993b2 100644 (file)
@@ -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")