s4-wintest: added wintest.py library

converted test-howto.py to use the wintest library.

The idea is for us to create other tests that test lots of different
interactions with windows

1 files changed, 242 insertions, 420 deletions

diff --git a/source4/scripting/devel/howto/test-howto.py b/source4/scripting/devel/howto/test-howto.py
index 955509f343..e08595a865 100755
--- a/source4/scripting/devel/howto/test-howto.py
+++ b/source4/scripting/devel/howto/test-howto.py
@@ -2,226 +2,59 @@
 
 '''automated testing of the steps of the Samba4 HOWTO'''
 
-import pexpect, subprocess
-import sys, os, time
+import sys, os
 import optparse
+import wintest
 
 vars = {}
 
 parser = optparse.OptionParser("samba_dnsupdate")
 parser.add_option("--conf", type='string', default='', help='config file')
 
-def load_config(fname):
-    '''load the config file'''
-    f = open(fname)
-    for line in f:
-        line = line.strip()
-        if len(line) == 0 or line[0] == '#':
-            continue
-        colon = line.find(':')
-        if colon == -1:
-            raise Exception("Invalid config line '%s'" % line)
-        varname = line[0:colon].strip()
-        value   = line[colon+1:].strip()
-        vars[varname] = value
-
-def substitute(text):
-    """Substitute strings of the form ${NAME} in text, replacing
-    with substitutions from vars.
-    """
-    if isinstance(text, list):
-        ret = text[:]
-        for i in range(len(ret)):
-            ret[i] = substitute(ret[i])
-        return ret
 
-    while True:
-        var_start = text.find("${")
-        if var_start == -1:
-            return text
-        var_end = text.find("}", var_start)
-        if var_end == -1:
-            return text
-        var_name = text[var_start+2:var_end]
-        if not var_name in vars:
-            raise Exception("Unknown substitution variable ${%s}" % var_name)
-        text = text.replace("${%s}" % var_name, vars[var_name])
-    return text
-
-
-
-def putenv(key, value):
-    os.putenv(key, substitute(value))
-
-def chdir(dir):
-    os.chdir(substitute(dir))
-
-
-def run_cmd(cmd, dir=".", show=None, output=False, checkfail=True):
-    cmd = substitute(cmd)
-    if isinstance(cmd, list):
-        print('$ ' + " ".join(cmd))
-    else:
-        print('$ ' + cmd)
-    if output:
-        return subprocess.Popen([cmd], shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, cwd=dir).communicate()[0]
-    if isinstance(cmd, list):
-        shell=False
-    else:
-        shell=True
-    if checkfail:
-        return subprocess.check_call(cmd, shell=shell, cwd=dir)
-    else:
-        return subprocess.call(cmd, shell=shell, cwd=dir)
-
-
-def cmd_output(cmd):
-    '''return output from and command'''
-    cmd = substitute(cmd)
-    return run_cmd(cmd, output=True)
-
-def cmd_contains(cmd, contains, nomatch=False, ordered=False):
-    '''check that command output contains the listed strings'''
-    out = cmd_output(cmd)
-    print out
-    for c in substitute(contains):
-        ofs = out.find(c)
-        if nomatch:
-            if ofs != -1:
-                raise Exception("Expected to not see %s in %s" % (c, cmd))
-        else:
-            if ofs == -1:
-                raise Exception("Expected to see %s in %s" % (c, cmd))
-        if ordered and ofs != -1:
-            ofs += len(c)
-            out = out[ofs:]
-
-def retry_cmd(cmd, contains, retries=30, delay=2, wait_for_fail=False):
-    '''retry a command a number of times'''
-    while retries > 0:
-        try:
-            cmd_contains(cmd, contains, nomatch=wait_for_fail)
-            return
-        except:
-            time.sleep(delay)
-            retries = retries - 1
-    raise Exception("Failed to find %s" % contains)
-
-def pexpect_spawn(cmd, timeout=60):
-    '''wrapper around pexpect spawn'''
-
-    cmd = substitute(cmd)
-    print("$ " + cmd)
-    ret = pexpect.spawn(cmd, logfile=sys.stdout, timeout=timeout)
-
-    def sendline_sub(line):
-        line = substitute(line).replace('\n', '\r\n')
-        return ret.old_sendline(line + '\r')
-
-    def expect_sub(line, timeout=ret.timeout):
-        line = substitute(line)
-        return ret.old_expect(line, timeout=timeout)
-
-    ret.old_sendline = ret.sendline
-    ret.sendline = sendline_sub
-    ret.old_expect = ret.expect
-    ret.expect = expect_sub
-
-    return ret
-
-def vm_poweroff(vmname, checkfail=True):
-    '''power off a VM'''
-    vars['VMNAME'] = vmname
-    run_cmd("${VM_POWEROFF}", checkfail=checkfail)
-
-def vm_restore(vmname, snapshot):
-    '''restore a VM'''
-    vars['VMNAME'] = vmname
-    vars['SNAPSHOT'] = snapshot
-    run_cmd("${VM_RESTORE}")
-
-def ping_wait(hostname):
-    '''wait for a hostname to come up on the network'''
-    hostname=substitute(hostname)
-    loops=10
-    while loops > 0:
-        try:
-            run_cmd("ping -c 1 -w 10 %s" % hostname)
-            break
-        except:
-            loops = loops - 1
-    if loops == 0:
-        raise Exception("Failed to ping %s" % hostname)
-    print("Host %s is up" % hostname)
-
-def port_wait(hostname, port, retries=100, delay=2, wait_for_fail=False):
-    '''wait for a host to come up on the network'''
-    retry_cmd("nc -v -z -w 1 %s %u" % (hostname, port), ['succeeded'],
-              retries=retries, delay=delay, wait_for_fail=wait_for_fail)
-
-def open_telnet(hostname, username, password, retries=30, delay=3, set_time=False):
-    '''open a telnet connection to a windows server, return the pexpect child'''
-    while retries > 0:
-        child = pexpect_spawn("telnet " + hostname + " -l '" + username + "'")
-        i = child.expect(["Welcome to Microsoft Telnet Service",
-                          "No more connections are allowed to telnet server"])
-        if i != 0:
-            time.sleep(delay)
-            retries -= 1
-            continue
-        child.expect("password:")
-        child.sendline(password)
-        child.expect("C:")
-        if set_time:
-            child.sendline("net time \\\\${HOSTNAME} /set")
-            child.expect("Do you want to set the local computer")
-            child.sendline("Y")
-            child.expect("The command completed successfully")
-        return child
-
-
-def check_prerequesites():
+def check_prerequesites(t):
     print("Checking prerequesites")
-    vars['HOSTNAME'] = cmd_output("hostname -s").strip()
+    t.setvar('HOSTNAME', t.cmd_output("hostname -s").strip())
     if os.getuid() != 0:
         raise Exception("You must run this script as root")
-    cmd_contains("grep 127.0.0.1 /etc/resolv.conf", ["nameserver 127.0.0.1"])
+    t.cmd_contains("grep 127.0.0.1 /etc/resolv.conf", ["nameserver 127.0.0.1"])
 
-def build_s4(prefix=None):
+
+def build_s4(t):
     '''build samba4'''
     print('Building s4')
-    chdir('${SOURCETREE}/source4')
-    putenv('CC', 'ccache gcc')
-    run_cmd('make reconfigure || ./configure --enable-auto-reconfigure --enable-developer --prefix=${PREFIX} -C')
-    run_cmd('make -j')
-    run_cmd('rm -rf ${PREFIX}')
-    run_cmd('make -j install')
-
-def provision_s4():
+    t.chdir('${SOURCETREE}/source4')
+    t.putenv('CC', 'ccache gcc')
+    t.run_cmd('make reconfigure || ./configure --enable-auto-reconfigure --enable-developer --prefix=${PREFIX} -C')
+    t.run_cmd('make -j')
+    t.run_cmd('rm -rf ${PREFIX}')
+    t.run_cmd('make -j install')
+
+def provision_s4(t):
     '''provision s4 as a DC'''
     print('Provisioning s4')
-    chdir('${PREFIX}')
-    run_cmd("rm -rf etc private")
-    run_cmd('sbin/provision --realm=${LCREALM} --domain=${DOMAIN} --adminpass=${PASSWORD1} --server-role="domain controller" --function-level=2008 -d${DEBUGLEVEL}')
-    run_cmd('bin/samba-tool newuser testallowed ${PASSWORD1}')
-    run_cmd('bin/samba-tool newuser testdenied ${PASSWORD1}')
-    run_cmd('bin/samba-tool group addmembers "Allowed RODC Password Replication Group" testallowed')
-
-def start_s4(prefix=None, interfaces=None):
+    t.chdir('${PREFIX}')
+    t.run_cmd("rm -rf etc private")
+    t.run_cmd('sbin/provision --realm=${LCREALM} --domain=${DOMAIN} --adminpass=${PASSWORD1} --server-role="domain controller" --function-level=2008 -d${DEBUGLEVEL}')
+    t.run_cmd('bin/samba-tool newuser testallowed ${PASSWORD1}')
+    t.run_cmd('bin/samba-tool newuser testdenied ${PASSWORD1}')
+    t.run_cmd('bin/samba-tool group addmembers "Allowed RODC Password Replication Group" testallowed')
+
+def start_s4(t, interfaces=None):
     print('Starting Samba4')
-    chdir(prefix)
-    run_cmd('killall -9 -q samba smbd nmbd winbindd', checkfail=False)
-    run_cmd(['sbin/samba',
+    t.chdir("${PREFIX}")
+    t.run_cmd('killall -9 -q samba smbd nmbd winbindd', checkfail=False)
+    t.run_cmd(['sbin/samba',
              '--option', 'panic action=gnome-terminal -e "gdb --pid %PID%"',
              '--option', 'interfaces=%s' % interfaces])
-    port_wait("localhost", 445)
+    t.port_wait("localhost", 445)
 
-def test_smbclient():
+def test_smbclient(t):
     print('Testing smbclient')
-    chdir('${PREFIX}')
-    cmd_contains("bin/smbclient --version", ["Version 4.0"])
-    retry_cmd('bin/smbclient -L localhost -U%', ["netlogon", "sysvol", "IPC Service"])
-    child = pexpect_spawn('bin/smbclient //localhost/netlogon -Uadministrator%${PASSWORD1}')
+    t.chdir('${PREFIX}')
+    t.cmd_contains("bin/smbclient --version", ["Version 4.0"])
+    t.retry_cmd('bin/smbclient -L localhost -U%', ["netlogon", "sysvol", "IPC Service"])
+    child = t.pexpect_spawn('bin/smbclient //localhost/netlogon -Uadministrator%${PASSWORD1}')
     child.expect("smb:")
     child.sendline("dir")
     child.expect("blocks available")
@@ -232,11 +65,11 @@ def test_smbclient():
     child.sendline("cd ..")
     child.sendline("rmdir testdir")
 
-def create_shares():
+def create_shares(t):
     print("Adding test shares")
-    chdir('${PREFIX}')
+    t.chdir('${PREFIX}')
     f = open("etc/smb.conf", mode='a')
-    f.write(substitute('''
+    f.write(t.substitute('''
 [test]
        path = ${PREFIX}/test
        read only = no
@@ -245,96 +78,82 @@ def create_shares():
        read only = no
     '''))
     f.close()
-    run_cmd("mkdir -p test")
-    run_cmd("mkdir -p var/profiles")
+    t.run_cmd("mkdir -p test")
+    t.run_cmd("mkdir -p var/profiles")
 
 
-def restart_bind():
+def restart_bind(t):
     print("Restarting bind9")
-    putenv('KEYTAB_FILE', '${PREFIX}/private/dns.keytab')
-    putenv('KRB5_KTNAME', '${PREFIX}/private/dns.keytab')
-    run_cmd('killall -9 -q named', checkfail=False)
-    port_wait("localhost", 53, wait_for_fail=True)
-    run_cmd("${BIND9}")
-    port_wait("localhost", 53)
-    run_cmd("${RNDC} flush")
-    run_cmd("${RNDC} freeze")
-    run_cmd("${RNDC} thaw")
-
-def test_dns():
+    t.putenv('KEYTAB_FILE', '${PREFIX}/private/dns.keytab')
+    t.putenv('KRB5_KTNAME', '${PREFIX}/private/dns.keytab')
+    t.run_cmd('killall -9 -q named', checkfail=False)
+    t.port_wait("localhost", 53, wait_for_fail=True)
+    t.run_cmd("${BIND9}")
+    t.port_wait("localhost", 53)
+    t.run_cmd("${RNDC} flush")
+    t.run_cmd("${RNDC} freeze")
+    t.run_cmd("${RNDC} thaw")
+
+def test_dns(t):
     print("Testing DNS")
-    cmd_contains("host -t SRV _ldap._tcp.${LCREALM}.",
+    t.cmd_contains("host -t SRV _ldap._tcp.${LCREALM}.",
                  ['_ldap._tcp.${LCREALM} has SRV record 0 100 389 ${HOSTNAME}.${LCREALM}'])
-    cmd_contains("host -t SRV  _kerberos._udp.${LCREALM}.",
+    t.cmd_contains("host -t SRV  _kerberos._udp.${LCREALM}.",
                  ['_kerberos._udp.${LCREALM} has SRV record 0 100 88 ${HOSTNAME}.${LCREALM}'])
-    cmd_contains("host -t A ${HOSTNAME}.${LCREALM}",
+    t.cmd_contains("host -t A ${HOSTNAME}.${LCREALM}",
                  ['${HOSTNAME}.${LCREALM} has address'])
 
-def do_kinit(username, password):
-    '''use kinit to setup a credentials cache'''
-    run_cmd("kdestroy")
-    putenv('KRB5CCNAME', "${PREFIX}/ccache.test")
-    username = substitute(username)
-    s = username.split('@')
-    if len(s) > 0:
-        s[1] = s[1].upper()
-    username = '@'.join(s)
-    child = pexpect_spawn('kinit -V ' + username)
-    child.expect("Password for")
-    child.sendline(password)
-    child.expect("Authenticated to Kerberos")
-
-def test_kerberos():
+def test_kerberos(t):
     print("Testing kerberos")
-    run_cmd("kdestroy")
-    do_kinit("administrator@${REALM}", "${PASSWORD1}")
-    cmd_contains("klist -e", ["Ticket cache", "Default principal", "Valid starting"])
+    t.run_cmd("kdestroy")
+    t.kinit("administrator@${REALM}", "${PASSWORD1}")
+    t.cmd_contains("klist -e", ["Ticket cache", "Default principal", "Valid starting"])
 
 
-def test_dyndns():
-    chdir('${PREFIX}')
-    cmd_contains("sbin/samba_dnsupdate", [])
-    run_cmd("${RNDC} flush")
-    cmd_contains("sbin/samba_dnsupdate --verbose", ["No DNS updates needed"])
+def test_dyndns(t):
+    t.chdir('${PREFIX}')
+    t.cmd_contains("sbin/samba_dnsupdate", [])
+    t.run_cmd("${RNDC} flush")
+    t.cmd_contains("sbin/samba_dnsupdate --verbose", ["No DNS updates needed"])
 
-def join_win7():
+def join_win7(t):
     print("Joining a Win7 box to the domain")
-    vm_poweroff("${WINDOWS7_VM}", checkfail=False)
-    vm_restore("${WINDOWS7_VM}", "${WINDOWS7_SNAPSHOT}")
-    ping_wait("${WINDOWS7}")
-    port_wait("${WINDOWS7}", 23)
-    child = open_telnet("${WINDOWS7}", "administrator", "${PASSWORD1}")
+    t.vm_poweroff("${WINDOWS7_VM}", checkfail=False)
+    t.vm_restore("${WINDOWS7_VM}", "${WINDOWS7_SNAPSHOT}")
+    t.ping_wait("${WINDOWS7}")
+    t.port_wait("${WINDOWS7}", 23)
+    child = t.open_telnet("${WINDOWS7}", "administrator", "${PASSWORD1}", set_time=True)
     child.sendline("netdom join ${WINDOWS7} /Domain:${LCREALM} /PasswordD:${PASSWORD1} /UserD:administrator")
     child.expect("The computer needs to be restarted in order to complete the operation")
     child.expect("The command completed successfully")
     child.sendline("shutdown /r -t 0")
-    port_wait("${WINDOWS7}", 23, wait_for_fail=True)
-    port_wait("${WINDOWS7}", 23)
+    t.port_wait("${WINDOWS7}", 23, wait_for_fail=True)
+    t.port_wait("${WINDOWS7}", 23)
 
 
-def test_win7():
+def test_win7(t):
     print("Checking the win7 join is OK")
-    chdir('${PREFIX}')
-    port_wait("${WINDOWS7}", 445)
-    retry_cmd('bin/smbclient -L ${WINDOWS7}.${LCREALM} -Uadministrator@${LCREALM}%${PASSWORD1}', ["C$", "IPC$", "Sharename"])
-    cmd_contains("host -t A ${WINDOWS7}.${LCREALM}.", ['has address'])
-    cmd_contains('bin/smbclient -L ${WINDOWS7}.${LCREALM} -Utestallowed@${LCREALM}%${PASSWORD1}', ["C$", "IPC$", "Sharename"])
-    cmd_contains('bin/smbclient -L ${WINDOWS7}.${LCREALM} -k no -Utestallowed@${LCREALM}%${PASSWORD1}', ["C$", "IPC$", "Sharename"])
-    cmd_contains('bin/smbclient -L ${WINDOWS7}.${LCREALM} -k yes -Utestallowed@${LCREALM}%${PASSWORD1}', ["C$", "IPC$", "Sharename"])
-    port_wait("${WINDOWS7}", 23)
-    child = open_telnet("${WINDOWS7}", "${DOMAIN}\\administrator", "${PASSWORD1}")
+    t.chdir('${PREFIX}')
+    t.port_wait("${WINDOWS7}", 445)
+    t.retry_cmd('bin/smbclient -L ${WINDOWS7}.${LCREALM} -Uadministrator@${LCREALM}%${PASSWORD1}', ["C$", "IPC$", "Sharename"])
+    t.cmd_contains("host -t A ${WINDOWS7}.${LCREALM}.", ['has address'])
+    t.cmd_contains('bin/smbclient -L ${WINDOWS7}.${LCREALM} -Utestallowed@${LCREALM}%${PASSWORD1}', ["C$", "IPC$", "Sharename"])
+    t.cmd_contains('bin/smbclient -L ${WINDOWS7}.${LCREALM} -k no -Utestallowed@${LCREALM}%${PASSWORD1}', ["C$", "IPC$", "Sharename"])
+    t.cmd_contains('bin/smbclient -L ${WINDOWS7}.${LCREALM} -k yes -Utestallowed@${LCREALM}%${PASSWORD1}', ["C$", "IPC$", "Sharename"])
+    t.port_wait("${WINDOWS7}", 23)
+    child = t.open_telnet("${WINDOWS7}", "${DOMAIN}\\administrator", "${PASSWORD1}")
     child.sendline("net use t: \\\\${HOSTNAME}.${LCREALM}\\test")
     child.expect("The command completed successfully")
-    vm_poweroff("${WINDOWS7_VM}")
+    t.vm_poweroff("${WINDOWS7_VM}")
 
 
-def join_w2k8():
+def join_w2k8(t):
     print("Joining a w2k8 box to the domain as a DC")
-    vm_poweroff("${WINDOWS_DC1_VM}", checkfail=False)
-    vm_restore("${WINDOWS_DC1_VM}", "${WINDOWS_DC1_SNAPSHOT}")
-    ping_wait("${WINDOWS_DC1}")
-    port_wait("${WINDOWS_DC1}", 23)
-    child = open_telnet("${WINDOWS_DC1}", "administrator", "${WINDOWS_DC1_PASS}")
+    t.vm_poweroff("${WINDOWS_DC1_VM}", checkfail=False)
+    t.vm_restore("${WINDOWS_DC1_VM}", "${WINDOWS_DC1_SNAPSHOT}")
+    t.ping_wait("${WINDOWS_DC1}")
+    t.port_wait("${WINDOWS_DC1}", 23)
+    child = t.open_telnet("${WINDOWS_DC1}", "administrator", "${WINDOWS_DC1_PASS}")
     child.sendline("copy /Y con answers.txt")
     child.sendline('''
 [DCInstall]
@@ -360,28 +179,28 @@ RebootOnCompletion=No
     if i != 0:
         raise Exception("dcpromo failed")
     child.sendline("shutdown -r -t 0")
-    port_wait("${WINDOWS_DC1}", 23, wait_for_fail=True)
-    port_wait("${WINDOWS_DC1}", 23)
+    t.port_wait("${WINDOWS_DC1}", 23, wait_for_fail=True)
+    t.port_wait("${WINDOWS_DC1}", 23)
 
 
-def test_w2k8():
+def test_w2k8(t):
     print("Checking the w2k8 join is OK")
-    chdir('${PREFIX}')
-    port_wait("${WINDOWS_DC1}", 445)
-    retry_cmd('bin/smbclient -L ${WINDOWS_DC1}.${LCREALM} -Uadministrator@${LCREALM}%${PASSWORD1}', ["C$", "IPC$", "Sharename"])
-    cmd_contains("host -t A ${WINDOWS_DC1}.${LCREALM}.", ['has address'])
-    cmd_contains('bin/smbclient -L ${WINDOWS_DC1}.${LCREALM} -Utestallowed@${LCREALM}%${PASSWORD1}', ["C$", "IPC$", "Sharename"])
-    port_wait("${WINDOWS_DC1}", 23)
+    t.chdir('${PREFIX}')
+    t.port_wait("${WINDOWS_DC1}", 445)
+    t.retry_cmd('bin/smbclient -L ${WINDOWS_DC1}.${LCREALM} -Uadministrator@${LCREALM}%${PASSWORD1}', ["C$", "IPC$", "Sharename"])
+    t.cmd_contains("host -t A ${WINDOWS_DC1}.${LCREALM}.", ['has address'])
+    t.cmd_contains('bin/smbclient -L ${WINDOWS_DC1}.${LCREALM} -Utestallowed@${LCREALM}%${PASSWORD1}', ["C$", "IPC$", "Sharename"])
+    t.port_wait("${WINDOWS_DC1}", 23)
 
-    cmd_contains("bin/samba-tool drs kcc ${HOSTNAME} -Uadministrator@${LCREALM}%${PASSWORD1}", ['Consistency check', 'successful'])
-    cmd_contains("bin/samba-tool drs kcc ${WINDOWS_DC1} -Uadministrator@${LCREALM}%${PASSWORD1}", ['Consistency check', 'successful'])
+    t.cmd_contains("bin/samba-tool drs kcc ${HOSTNAME} -Uadministrator@${LCREALM}%${PASSWORD1}", ['Consistency check', 'successful'])
+    t.cmd_contains("bin/samba-tool drs kcc ${WINDOWS_DC1} -Uadministrator@${LCREALM}%${PASSWORD1}", ['Consistency check', 'successful'])
 
-    do_kinit("administrator@${REALM}", "${PASSWORD1}")
+    t.kinit("administrator@${REALM}", "${PASSWORD1}")
     for nc in [ '${BASEDN}', 'CN=Configuration,${BASEDN}', 'CN=Schema,CN=Configuration,${BASEDN}' ]:
-        cmd_contains("bin/samba-tool drs replicate ${HOSTNAME} ${WINDOWS_DC1} %s -k yes" % nc, ["was successful"])
-        cmd_contains("bin/samba-tool drs replicate ${WINDOWS_DC1} ${HOSTNAME} %s -k yes" % nc, ["was successful"])
+        t.cmd_contains("bin/samba-tool drs replicate ${HOSTNAME} ${WINDOWS_DC1} %s -k yes" % nc, ["was successful"])
+        t.cmd_contains("bin/samba-tool drs replicate ${WINDOWS_DC1} ${HOSTNAME} %s -k yes" % nc, ["was successful"])
 
-    cmd_contains("bin/samba-tool drs showrepl ${HOSTNAME} -k yes",
+    t.cmd_contains("bin/samba-tool drs showrepl ${HOSTNAME} -k yes",
                  [ "INBOUND NEIGHBORS",
                    "${BASEDN}",
                    "Last attempt", "was successful",
@@ -394,7 +213,7 @@ def test_w2k8():
                    "Last success"],
                  ordered=True)
 
-    cmd_contains("bin/samba-tool drs showrepl ${WINDOWS_DC1} -k yes",
+    t.cmd_contains("bin/samba-tool drs showrepl ${WINDOWS_DC1} -k yes",
                  [ "INBOUND NEIGHBORS",
                    "${BASEDN}",
                    "Last attempt", "was successful",
@@ -407,10 +226,11 @@ def test_w2k8():
                    "Last success" ],
                  ordered=True)
 
-    child = open_telnet("${WINDOWS_DC1}", "${DOMAIN}\\administrator", "${PASSWORD1}", set_time=True)
+    child = t.open_telnet("${WINDOWS_DC1}", "${DOMAIN}\\administrator", "${PASSWORD1}", set_time=True)
     child.sendline("net use t: \\\\${HOSTNAME}.${LCREALM}\\test")
     child.expect("The command completed successfully")
 
+    t.run_net_time(child)
 
     print("Checking if showrepl is happy")
     child.sendline("repadmin /showrepl")
@@ -422,9 +242,9 @@ def test_w2k8():
     child.expect("was successful")
 
     print("Checking if new users propogate to windows")
-    run_cmd('bin/samba-tool newuser test2 ${PASSWORD2}')
-    retry_cmd("bin/smbclient -L ${WINDOWS_DC1} -Utest2%${PASSWORD2} -k no", ['Sharename', 'Remote IPC'])
-    retry_cmd("bin/smbclient -L ${WINDOWS_DC1} -Utest2%${PASSWORD2} -k yes", ['Sharename', 'Remote IPC'])
+    t.run_cmd('bin/samba-tool newuser test2 ${PASSWORD2}')
+    t.retry_cmd("bin/smbclient -L ${WINDOWS_DC1} -Utest2%${PASSWORD2} -k no", ['Sharename', 'Remote IPC'])
+    t.retry_cmd("bin/smbclient -L ${WINDOWS_DC1} -Utest2%${PASSWORD2} -k yes", ['Sharename', 'Remote IPC'])
 
     print("Checking if new users on windows propogate to samba")
     child.sendline("net user test3 ${PASSWORD3} /add")
@@ -435,28 +255,28 @@ def test_w2k8():
             break
         time.sleep(2)
 
-    retry_cmd("bin/smbclient -L ${HOSTNAME} -Utest3%${PASSWORD3} -k no", ['Sharename', 'IPC'])
-    retry_cmd("bin/smbclient -L ${HOSTNAME} -Utest3%${PASSWORD3} -k yes", ['Sharename', 'IPC'])
+    t.retry_cmd("bin/smbclient -L ${HOSTNAME} -Utest3%${PASSWORD3} -k no", ['Sharename', 'IPC'])
+    t.retry_cmd("bin/smbclient -L ${HOSTNAME} -Utest3%${PASSWORD3} -k yes", ['Sharename', 'IPC'])
 
     print("Checking propogation of user deletion")
-    run_cmd('bin/samba-tool user delete test2 -Uadministrator@${LCREALM}%${PASSWORD1}')
+    t.run_cmd('bin/samba-tool user delete test2 -Uadministrator@${LCREALM}%${PASSWORD1}')
     child.sendline("net user test3 /del")
     child.expect("The command completed successfully")
 
-    retry_cmd("bin/smbclient -L ${WINDOWS_DC1} -Utest2%${PASSWORD2} -k no", ['LOGON_FAILURE'])
-    retry_cmd("bin/smbclient -L ${HOSTNAME} -Utest3%${PASSWORD3} -k no", ['LOGON_FAILURE'])
-    retry_cmd("bin/smbclient -L ${WINDOWS_DC1} -Utest2%${PASSWORD2} -k yes", ['LOGON_FAILURE'])
-    retry_cmd("bin/smbclient -L ${HOSTNAME} -Utest3%${PASSWORD3} -k yes", ['LOGON_FAILURE'])
-    vm_poweroff("${WINDOWS_DC1_VM}")
+    t.retry_cmd("bin/smbclient -L ${WINDOWS_DC1} -Utest2%${PASSWORD2} -k no", ['LOGON_FAILURE'])
+    t.retry_cmd("bin/smbclient -L ${HOSTNAME} -Utest3%${PASSWORD3} -k no", ['LOGON_FAILURE'])
+    t.retry_cmd("bin/smbclient -L ${WINDOWS_DC1} -Utest2%${PASSWORD2} -k yes", ['LOGON_FAILURE'])
+    t.retry_cmd("bin/smbclient -L ${HOSTNAME} -Utest3%${PASSWORD3} -k yes", ['LOGON_FAILURE'])
+    t.vm_poweroff("${WINDOWS_DC1_VM}")
 
 
-def join_w2k8_rodc():
+def join_w2k8_rodc(t):
     print("Joining a w2k8 box to the domain as a RODC")
-    vm_poweroff("${WINDOWS_DC2_VM}", checkfail=False)
-    vm_restore("${WINDOWS_DC2_VM}", "${WINDOWS_DC2_SNAPSHOT}")
-    ping_wait("${WINDOWS_DC2}")
-    port_wait("${WINDOWS_DC2}", 23)
-    child = open_telnet("${WINDOWS_DC2}", "administrator", "${WINDOWS_DC2_PASS}")
+    t.vm_poweroff("${WINDOWS_DC2_VM}", checkfail=False)
+    t.vm_restore("${WINDOWS_DC2_VM}", "${WINDOWS_DC2_SNAPSHOT}")
+    t.ping_wait("${WINDOWS_DC2}")
+    t.port_wait("${WINDOWS_DC2}", 23)
+    child = t.open_telnet("${WINDOWS_DC2}", "administrator", "${WINDOWS_DC2_PASS}")
     child.sendline("copy /Y con answers.txt")
     child.sendline('''
 [DCInstall]
@@ -489,20 +309,20 @@ RebootOnCompletion=No
     if i != 0:
         raise Exception("dcpromo failed")
     child.sendline("shutdown -r -t 0")
-    port_wait("${WINDOWS_DC2}", 23, wait_for_fail=True)
-    port_wait("${WINDOWS_DC2}", 23)
+    t.port_wait("${WINDOWS_DC2}", 23, wait_for_fail=True)
+    t.port_wait("${WINDOWS_DC2}", 23)
 
 
 
-def test_w2k8_rodc():
+def test_w2k8_rodc(t):
     print("Checking the w2k8 RODC join is OK")
-    chdir('${PREFIX}')
-    port_wait("${WINDOWS_DC2}", 445)
-    retry_cmd('bin/smbclient -L ${WINDOWS_DC2}.${LCREALM} -Uadministrator@${LCREALM}%${PASSWORD1}', ["C$", "IPC$", "Sharename"])
-    cmd_contains("host -t A ${WINDOWS_DC2}.${LCREALM}.", ['has address'])
-    cmd_contains('bin/smbclient -L ${WINDOWS_DC2}.${LCREALM} -Utestallowed@${LCREALM}%${PASSWORD1}', ["C$", "IPC$", "Sharename"])
-    port_wait("${WINDOWS_DC2}", 23)
-    child = open_telnet("${WINDOWS_DC2}", "${DOMAIN}\\administrator", "${PASSWORD1}", set_time=True)
+    t.chdir('${PREFIX}')
+    t.port_wait("${WINDOWS_DC2}", 445)
+    t.retry_cmd('bin/smbclient -L ${WINDOWS_DC2}.${LCREALM} -Uadministrator@${LCREALM}%${PASSWORD1}', ["C$", "IPC$", "Sharename"])
+    t.cmd_contains("host -t A ${WINDOWS_DC2}.${LCREALM}.", ['has address'])
+    t.cmd_contains('bin/smbclient -L ${WINDOWS_DC2}.${LCREALM} -Utestallowed@${LCREALM}%${PASSWORD1}', ["C$", "IPC$", "Sharename"])
+    t.port_wait("${WINDOWS_DC2}", 23)
+    child = t.open_telnet("${WINDOWS_DC2}", "${DOMAIN}\\administrator", "${PASSWORD1}", set_time=True)
     child.sendline("net use t: \\\\${HOSTNAME}.${LCREALM}\\test")
     child.expect("The command completed successfully")
 
@@ -516,43 +336,44 @@ def test_w2k8_rodc():
     child.expect("was successful")
 
     print("Checking if new users are available on windows")
-    run_cmd('bin/samba-tool newuser test2 ${PASSWORD2}')
-    retry_cmd("bin/smbclient -L ${WINDOWS_DC2} -Utest2%${PASSWORD2} -k no", ['Sharename', 'Remote IPC'])
-    retry_cmd("bin/smbclient -L ${WINDOWS_DC2} -Utest2%${PASSWORD2} -k yes", ['Sharename', 'Remote IPC'])
-    run_cmd('bin/samba-tool user delete test2 -Uadministrator@${LCREALM}%${PASSWORD1}')
-    retry_cmd("bin/smbclient -L ${WINDOWS_DC2} -Utest2%${PASSWORD2}", ['LOGON_FAILURE'])
-    vm_poweroff("${WINDOWS_DC2_VM}")
+    t.run_cmd('bin/samba-tool newuser test2 ${PASSWORD2}')
+    t.retry_cmd("bin/smbclient -L ${WINDOWS_DC2} -Utest2%${PASSWORD2} -k no", ['Sharename', 'Remote IPC'])
+    t.retry_cmd("bin/smbclient -L ${WINDOWS_DC2} -Utest2%${PASSWORD2} -k yes", ['Sharename', 'Remote IPC'])
+    t.run_cmd('bin/samba-tool user delete test2 -Uadministrator@${LCREALM}%${PASSWORD1}')
+    t.retry_cmd("bin/smbclient -L ${WINDOWS_DC2} -Utest2%${PASSWORD2}", ['LOGON_FAILURE'])
+    t.vm_poweroff("${WINDOWS_DC2_VM}")
 
 
-def vampire_w2k8():
+def vampire_w2k8(t):
     print("Joining w2k8 as a second DC")
-    chdir('${PREFIX}')
-    run_cmd('killall -9 -q samba smbd nmbd winbindd', checkfail=False)
-    vm_poweroff("${WINDOWS_DC3_VM}", checkfail=False)
-    vm_restore("${WINDOWS_DC3_VM}", "${WINDOWS_DC3_SNAPSHOT}")
-    run_cmd('${RNDC} flush')
-    run_cmd("rm -rf etc private")
-    retry_cmd("bin/samba-tool drs showrepl ${WINDOWS_DC3} -Uadministrator%${WINDOWS_DC3_PASS}", ['INBOUND NEIGHBORS'] )
-    run_cmd('bin/samba-tool join ${WINDOWS_DC3_REALM} DC -Uadministrator%${WINDOWS_DC3_PASS} -d${DEBUGLEVEL}')
-    run_cmd('bin/samba-tool drs kcc ${WINDOWS_DC3} -Uadministrator@${WINDOWS_DC3_REALM}%${WINDOWS_DC3_PASS}')
-
-
-def test_vampire():
+    t.chdir('${PREFIX}')
+    t.run_cmd('killall -9 -q samba smbd nmbd winbindd', checkfail=False)
+    t.vm_poweroff("${WINDOWS_DC3_VM}", checkfail=False)
+    t.vm_restore("${WINDOWS_DC3_VM}", "${WINDOWS_DC3_SNAPSHOT}")
+    t.run_cmd('${RNDC} flush')
+    t.run_cmd("rm -rf etc private")
+    t.open_telnet("${WINDOWS_DC3}", "${WINDOWS_DC3_DOMAIN}\\administrator", "${WINDOWS_DC3_PASS}", set_time=True)
+    t.retry_cmd("bin/samba-tool drs showrepl ${WINDOWS_DC3} -Uadministrator%${WINDOWS_DC3_PASS}", ['INBOUND NEIGHBORS'] )
+    t.run_cmd('bin/samba-tool join ${WINDOWS_DC3_REALM} DC -Uadministrator%${WINDOWS_DC3_PASS} -d${DEBUGLEVEL}')
+    t.run_cmd('bin/samba-tool drs kcc ${WINDOWS_DC3} -Uadministrator@${WINDOWS_DC3_REALM}%${WINDOWS_DC3_PASS}')
+
+
+def test_vampire(t):
     print("Checking the DC join is OK")
-    chdir('${PREFIX}')
-    retry_cmd('bin/smbclient -L ${HOSTNAME}.${WINDOWS_DC3_REALM} -Uadministrator@${WINDOWS_DC3_REALM}%${WINDOWS_DC3_PASS}', ["C$", "IPC$", "Sharename"])
-    cmd_contains("host -t A ${HOSTNAME}.${WINDOWS_DC3_REALM}.", ['has address'])
-    port_wait("${WINDOWS_DC3}", 23)
-    child = open_telnet("${WINDOWS_DC3}", "${WINDOWS_DC3_DOMAIN}\\administrator", "${WINDOWS_DC3_PASS}", set_time=True)
+    t.chdir('${PREFIX}')
+    t.retry_cmd('bin/smbclient -L ${HOSTNAME}.${WINDOWS_DC3_REALM} -Uadministrator@${WINDOWS_DC3_REALM}%${WINDOWS_DC3_PASS}', ["C$", "IPC$", "Sharename"])
+    t.cmd_contains("host -t A ${HOSTNAME}.${WINDOWS_DC3_REALM}.", ['has address'])
+    t.port_wait("${WINDOWS_DC3}", 23)
+    child = t.open_telnet("${WINDOWS_DC3}", "${WINDOWS_DC3_DOMAIN}\\administrator", "${WINDOWS_DC3_PASS}", set_time=True)
 
     print("Forcing kcc runs, and replication")
-    run_cmd('bin/samba-tool drs kcc ${WINDOWS_DC3} -Uadministrator@${WINDOWS_DC3_REALM}%${WINDOWS_DC3_PASS}')
-    run_cmd('bin/samba-tool drs kcc ${HOSTNAME} -Uadministrator@${WINDOWS_DC3_REALM}%${WINDOWS_DC3_PASS}')
+    t.run_cmd('bin/samba-tool drs kcc ${WINDOWS_DC3} -Uadministrator@${WINDOWS_DC3_REALM}%${WINDOWS_DC3_PASS}')
+    t.run_cmd('bin/samba-tool drs kcc ${HOSTNAME} -Uadministrator@${WINDOWS_DC3_REALM}%${WINDOWS_DC3_PASS}')
 
-    do_kinit("administrator@${WINDOWS_DC3_REALM}", "${WINDOWS_DC3_PASS}")
+    t.kinit("administrator@${WINDOWS_DC3_REALM}", "${WINDOWS_DC3_PASS}")
     for nc in [ '${WINDOWS_DC3_BASEDN}', 'CN=Configuration,${WINDOWS_DC3_BASEDN}', 'CN=Schema,CN=Configuration,${WINDOWS_DC3_BASEDN}' ]:
-        cmd_contains("bin/samba-tool drs replicate ${HOSTNAME} ${WINDOWS_DC3} %s -k yes" % nc, ["was successful"])
-        cmd_contains("bin/samba-tool drs replicate ${WINDOWS_DC3} ${HOSTNAME} %s -k yes" % nc, ["was successful"])
+        t.cmd_contains("bin/samba-tool drs replicate ${HOSTNAME} ${WINDOWS_DC3} %s -k yes" % nc, ["was successful"])
+        t.cmd_contains("bin/samba-tool drs replicate ${WINDOWS_DC3} ${HOSTNAME} %s -k yes" % nc, ["was successful"])
 
     child.sendline("net use t: \\\\${HOSTNAME}.${WINDOWS_DC3_REALM}\\test")
     child.expect("The command completed successfully")
@@ -567,57 +388,58 @@ def test_vampire():
     child.expect("was successful")
 
     print("Checking if new users propogate to windows")
-    run_cmd('bin/samba-tool newuser test2 ${PASSWORD2}')
-    retry_cmd("bin/smbclient -L ${WINDOWS_DC3} -Utest2%${PASSWORD2} -k no", ['Sharename', 'Remote IPC'])
-    retry_cmd("bin/smbclient -L ${WINDOWS_DC3} -Utest2%${PASSWORD2} -k yes", ['Sharename', 'Remote IPC'])
+    t.run_cmd('bin/samba-tool newuser test2 ${PASSWORD2}')
+    t.retry_cmd("bin/smbclient -L ${WINDOWS_DC3} -Utest2%${PASSWORD2} -k no", ['Sharename', 'Remote IPC'])
+    t.retry_cmd("bin/smbclient -L ${WINDOWS_DC3} -Utest2%${PASSWORD2} -k yes", ['Sharename', 'Remote IPC'])
 
     print("Checking if new users on windows propogate to samba")
     child.sendline("net user test3 ${PASSWORD3} /add")
     child.expect("The command completed successfully")
-    retry_cmd("bin/smbclient -L ${HOSTNAME} -Utest2%${PASSWORD2} -k no", ['Sharename', 'IPC'])
-    retry_cmd("bin/smbclient -L ${HOSTNAME} -Utest2%${PASSWORD2} -k yes", ['Sharename', 'IPC'])
+    t.retry_cmd("bin/smbclient -L ${HOSTNAME} -Utest2%${PASSWORD2} -k no", ['Sharename', 'IPC'])
+    t.retry_cmd("bin/smbclient -L ${HOSTNAME} -Utest2%${PASSWORD2} -k yes", ['Sharename', 'IPC'])
 
     print("Checking propogation of user deletion")
-    run_cmd('bin/samba-tool user delete test2 -Uadministrator@${WINDOWS_DC3_REALM}%${WINDOWS_DC3_PASS}')
+    t.run_cmd('bin/samba-tool user delete test2 -Uadministrator@${WINDOWS_DC3_REALM}%${WINDOWS_DC3_PASS}')
     child.sendline("net user test3 /del")
     child.expect("The command completed successfully")
 
-    retry_cmd("bin/smbclient -L ${WINDOWS_DC3} -Utest2%${PASSWORD2} -k no", ['LOGON_FAILURE'])
-    retry_cmd("bin/smbclient -L ${HOSTNAME} -Utest2%${PASSWORD2} -k no", ['LOGON_FAILURE'])
-    retry_cmd("bin/smbclient -L ${WINDOWS_DC3} -Utest2%${PASSWORD2} -k yes", ['LOGON_FAILURE'])
-    retry_cmd("bin/smbclient -L ${HOSTNAME} -Utest2%${PASSWORD2} -k yes", ['LOGON_FAILURE'])
-    vm_poweroff("${WINDOWS_DC3_VM}")
+    t.retry_cmd("bin/smbclient -L ${WINDOWS_DC3} -Utest2%${PASSWORD2} -k no", ['LOGON_FAILURE'])
+    t.retry_cmd("bin/smbclient -L ${HOSTNAME} -Utest2%${PASSWORD2} -k no", ['LOGON_FAILURE'])
+    t.retry_cmd("bin/smbclient -L ${WINDOWS_DC3} -Utest2%${PASSWORD2} -k yes", ['LOGON_FAILURE'])
+    t.retry_cmd("bin/smbclient -L ${HOSTNAME} -Utest2%${PASSWORD2} -k yes", ['LOGON_FAILURE'])
+    t.vm_poweroff("${WINDOWS_DC3_VM}")
 
 
-def vampire_w2k3():
+def vampire_w2k3(t):
     print("Joining w2k3 as a second DC")
-    chdir('${PREFIX}')
-    run_cmd('killall -9 -q samba smbd nmbd winbindd', checkfail=False)
-    vm_poweroff("${WINDOWS_DC4_VM}", checkfail=False)
-    vm_restore("${WINDOWS_DC4_VM}", "${WINDOWS_DC4_SNAPSHOT}")
-    run_cmd('${RNDC} flush')
-    run_cmd("rm -rf etc private")
-    retry_cmd("bin/samba-tool drs showrepl ${WINDOWS_DC4} -Uadministrator%${WINDOWS_DC4_PASS}", ['INBOUND NEIGHBORS'] )
-    run_cmd('bin/samba-tool join ${WINDOWS_DC4_REALM} DC -Uadministrator%${WINDOWS_DC4_PASS} -d${DEBUGLEVEL}')
-    run_cmd('bin/samba-tool drs kcc ${WINDOWS_DC4} -Uadministrator@${WINDOWS_DC4_REALM}%${WINDOWS_DC4_PASS}')
-
-
-def test_vampire_w2k3():
+    t.chdir('${PREFIX}')
+    t.run_cmd('killall -9 -q samba smbd nmbd winbindd', checkfail=False)
+    t.vm_poweroff("${WINDOWS_DC4_VM}", checkfail=False)
+    t.vm_restore("${WINDOWS_DC4_VM}", "${WINDOWS_DC4_SNAPSHOT}")
+    t.run_cmd('${RNDC} flush')
+    t.run_cmd("rm -rf etc private")
+    t.open_telnet("${WINDOWS_DC4}", "${WINDOWS_DC4_DOMAIN}\\administrator", "${WINDOWS_DC4_PASS}", set_time=True)
+    t.retry_cmd("bin/samba-tool drs showrepl ${WINDOWS_DC4} -Uadministrator%${WINDOWS_DC4_PASS}", ['INBOUND NEIGHBORS'] )
+    t.run_cmd('bin/samba-tool join ${WINDOWS_DC4_REALM} DC -Uadministrator%${WINDOWS_DC4_PASS} -d${DEBUGLEVEL}')
+    t.run_cmd('bin/samba-tool drs kcc ${WINDOWS_DC4} -Uadministrator@${WINDOWS_DC4_REALM}%${WINDOWS_DC4_PASS}')
+
+
+def test_vampire_w2k3(t):
     print("Checking the DC join is OK")
-    chdir('${PREFIX}')
-    retry_cmd('bin/smbclient -L ${HOSTNAME}.${WINDOWS_DC4_REALM} -Uadministrator@${WINDOWS_DC4_REALM}%${WINDOWS_DC4_PASS}', ["C$", "IPC$", "Sharename"])
-    cmd_contains("host -t A ${HOSTNAME}.${WINDOWS_DC4_REALM}.", ['has address'])
-    port_wait("${WINDOWS_DC4}", 23)
-    child = open_telnet("${WINDOWS_DC4}", "${WINDOWS_DC4_DOMAIN}\\administrator", "${WINDOWS_DC4_PASS}", set_time=True)
+    t.chdir('${PREFIX}')
+    t.retry_cmd('bin/smbclient -L ${HOSTNAME}.${WINDOWS_DC4_REALM} -Uadministrator@${WINDOWS_DC4_REALM}%${WINDOWS_DC4_PASS}', ["C$", "IPC$", "Sharename"])
+    t.cmd_contains("host -t A ${HOSTNAME}.${WINDOWS_DC4_REALM}.", ['has address'])
+    t.port_wait("${WINDOWS_DC4}", 23)
+    child = t.open_telnet("${WINDOWS_DC4}", "${WINDOWS_DC4_DOMAIN}\\administrator", "${WINDOWS_DC4_PASS}", set_time=True)
 
     print("Forcing kcc runs, and replication")
-    run_cmd('bin/samba-tool drs kcc ${WINDOWS_DC4} -Uadministrator@${WINDOWS_DC4_REALM}%${WINDOWS_DC4_PASS}')
-    run_cmd('bin/samba-tool drs kcc ${HOSTNAME} -Uadministrator@${WINDOWS_DC4_REALM}%${WINDOWS_DC4_PASS}')
+    t.run_cmd('bin/samba-tool drs kcc ${WINDOWS_DC4} -Uadministrator@${WINDOWS_DC4_REALM}%${WINDOWS_DC4_PASS}')
+    t.run_cmd('bin/samba-tool drs kcc ${HOSTNAME} -Uadministrator@${WINDOWS_DC4_REALM}%${WINDOWS_DC4_PASS}')
 
-    do_kinit("administrator@${WINDOWS_DC4_REALM}", "${WINDOWS_DC4_PASS}")
+    t.kinit("administrator@${WINDOWS_DC4_REALM}", "${WINDOWS_DC4_PASS}")
     for nc in [ '${WINDOWS_DC4_BASEDN}', 'CN=Configuration,${WINDOWS_DC4_BASEDN}', 'CN=Schema,CN=Configuration,${WINDOWS_DC4_BASEDN}' ]:
-        cmd_contains("bin/samba-tool drs replicate ${HOSTNAME} ${WINDOWS_DC4} %s -k yes" % nc, ["was successful"])
-        cmd_contains("bin/samba-tool drs replicate ${WINDOWS_DC4} ${HOSTNAME} %s -k yes" % nc, ["was successful"])
+        t.cmd_contains("bin/samba-tool drs replicate ${HOSTNAME} ${WINDOWS_DC4} %s -k yes" % nc, ["was successful"])
+        t.cmd_contains("bin/samba-tool drs replicate ${WINDOWS_DC4} ${HOSTNAME} %s -k yes" % nc, ["was successful"])
 
     child.sendline("net use t: \\\\${HOSTNAME}.${WINDOWS_DC4_REALM}\\test")
     child.expect("The command completed successfully")
@@ -632,30 +454,28 @@ def test_vampire_w2k3():
     child.expect("was successful")
 
     print("Checking if new users propogate to windows")
-    run_cmd('bin/samba-tool newuser test2 ${PASSWORD2}')
-    retry_cmd("bin/smbclient -L ${WINDOWS_DC4} -Utest2%${PASSWORD2} -k no", ['Sharename', 'Remote IPC'])
-    retry_cmd("bin/smbclient -L ${WINDOWS_DC4} -Utest2%${PASSWORD2} -k yes", ['Sharename', 'Remote IPC'])
+    t.run_cmd('bin/samba-tool newuser test2 ${PASSWORD2}')
+    t.retry_cmd("bin/smbclient -L ${WINDOWS_DC4} -Utest2%${PASSWORD2} -k no", ['Sharename', 'Remote IPC'])
+    t.retry_cmd("bin/smbclient -L ${WINDOWS_DC4} -Utest2%${PASSWORD2} -k yes", ['Sharename', 'Remote IPC'])
 
     print("Checking if new users on windows propogate to samba")
     child.sendline("net user test3 ${PASSWORD3} /add")
     child.expect("The command completed successfully")
-    retry_cmd("bin/smbclient -L ${HOSTNAME} -Utest2%${PASSWORD2} -k no", ['Sharename', 'IPC'])
-    retry_cmd("bin/smbclient -L ${HOSTNAME} -Utest2%${PASSWORD2} -k yes", ['Sharename', 'IPC'])
+    t.retry_cmd("bin/smbclient -L ${HOSTNAME} -Utest2%${PASSWORD2} -k no", ['Sharename', 'IPC'])
+    t.retry_cmd("bin/smbclient -L ${HOSTNAME} -Utest2%${PASSWORD2} -k yes", ['Sharename', 'IPC'])
 
     print("Checking propogation of user deletion")
-    run_cmd('bin/samba-tool user delete test2 -Uadministrator@${WINDOWS_DC4_REALM}%${WINDOWS_DC4_PASS}')
+    t.run_cmd('bin/samba-tool user delete test2 -Uadministrator@${WINDOWS_DC4_REALM}%${WINDOWS_DC4_PASS}')
     child.sendline("net user test3 /del")
     child.expect("The command completed successfully")
 
-    retry_cmd("bin/smbclient -L ${WINDOWS_DC4} -Utest2%${PASSWORD2} -k no", ['LOGON_FAILURE'])
-    retry_cmd("bin/smbclient -L ${HOSTNAME} -Utest2%${PASSWORD2} -k no", ['LOGON_FAILURE'])
-    retry_cmd("bin/smbclient -L ${WINDOWS_DC4} -Utest2%${PASSWORD2} -k yes", ['LOGON_FAILURE'])
-    retry_cmd("bin/smbclient -L ${HOSTNAME} -Utest2%${PASSWORD2} -k yes", ['LOGON_FAILURE'])
-    vm_poweroff("${WINDOWS_DC4_VM}")
-
+    t.retry_cmd("bin/smbclient -L ${WINDOWS_DC4} -Utest2%${PASSWORD2} -k no", ['LOGON_FAILURE'])
+    t.retry_cmd("bin/smbclient -L ${HOSTNAME} -Utest2%${PASSWORD2} -k no", ['LOGON_FAILURE'])
+    t.retry_cmd("bin/smbclient -L ${WINDOWS_DC4} -Utest2%${PASSWORD2} -k yes", ['LOGON_FAILURE'])
+    t.retry_cmd("bin/smbclient -L ${HOSTNAME} -Utest2%${PASSWORD2} -k yes", ['LOGON_FAILURE'])
+    t.vm_poweroff("${WINDOWS_DC4_VM}")
 
 
-os.putenv('PYTHONUNBUFFERED', '1')
 
 opts, args = parser.parse_args()
 
@@ -663,38 +483,40 @@ if not opts.conf:
     print("Please specify a config file with --conf")
     sys.exit(1)
 
-load_config(opts.conf)
-
-check_prerequesites()
-build_s4('${PREFIX}')
-provision_s4()
-create_shares()
-start_s4('${PREFIX}', interfaces='${INTERFACES}')
-test_smbclient()
-restart_bind()
-test_dns()
-test_kerberos()
-test_dyndns()
-
-join_win7()
-test_win7()
-
-join_w2k8_rodc()
-test_w2k8_rodc()
-
-join_w2k8()
-test_w2k8()
-
-vampire_w2k8()
-create_shares()
-start_s4('${PREFIX}', interfaces='${INTERFACES}')
-test_dyndns()
-test_vampire()
-
-vampire_w2k3()
-create_shares()
-start_s4('${PREFIX}', interfaces='${INTERFACES}')
-test_dyndns()
-test_vampire_w2k3()
+t = wintest.wintest()
+t.load_config(opts.conf)
+
+check_prerequesites(t)
+
+build_s4(t)
+provision_s4(t)
+create_shares(t)
+start_s4(t, interfaces='${INTERFACES}')
+test_smbclient(t)
+restart_bind(t)
+test_dns(t)
+test_kerberos(t)
+test_dyndns(t)
+
+join_win7(t)
+test_win7(t)
+
+join_w2k8_rodc(t)
+test_w2k8_rodc(t)
+
+join_w2k8(t)
+test_w2k8(t)
+
+vampire_w2k8(t)
+create_shares(t)
+start_s4(t, interfaces='${INTERFACES}')
+test_dyndns(t)
+test_vampire(t)
+
+vampire_w2k3(t)
+create_shares(t)
+start_s4(t, interfaces='${INTERFACES}')
+test_dyndns(t)
+test_vampire_w2k3(t)
 
 print("All OK")