wintest: set nameserver on a more general place

Signed-off-by: Kai Blin <kai@samba.org>

diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py
index 110d65a05770e25fab4a96c4167f219cb57720a0..01aac37115425c2268c825ceeef1d1152e249518 100755 (executable)
--- 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)
         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"):
     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 a6da60681ea558fb40a393cd06c052598cd4eb8c..f6993b2bd68fe466f1893087dbfc41da0a16b6a4 100644 (file)
--- a/wintest/wintest.py
+++ b/wintest/wintest.py
@@ -437,8 +437,6 @@ options {
         self.info("Restarting bind9")
         self.chdir('${PREFIX}')
 
         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")
 
         self.run_cmd("mkdir -p var/named/data")
         self.run_cmd("chown -R ${BIND_USER} var/named")