[SCM] Samba Shared Repository - branch master updated
Andrew Tridgell
tridge at samba.org
Wed Nov 17 17:46:01 MST 2010
The branch, master has been updated
via 23e053d s4-test: rename scripting/devel/howto to scripting/devel/wintest
via f6c66cd s4-wintest: added wintest.py library
from 63029eb s3: Fix a missing return value
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 23e053d4a221f478d9f0dd5f422f64e7f5beccfe
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Nov 18 10:57:28 2010 +1100
s4-test: rename scripting/devel/howto to scripting/devel/wintest
this won't just be for the howto anymore
Autobuild-User: Andrew Tridgell <tridge at samba.org>
Autobuild-Date: Thu Nov 18 00:45:18 UTC 2010 on sn-devel-104
commit f6c66cd6eee6dbaf34b9cb0c38aa83934104a867
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Nov 18 10:56:05 2010 +1100
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
-----------------------------------------------------------------------
Summary of changes:
source4/scripting/devel/howto/test-howto.py | 700 --------------------
source4/scripting/devel/wintest/test-howto.py | 522 +++++++++++++++
.../scripting/devel/{howto => wintest}/tridge.conf | 0
source4/scripting/devel/wintest/wintest.py | 220 ++++++
4 files changed, 742 insertions(+), 700 deletions(-)
delete mode 100755 source4/scripting/devel/howto/test-howto.py
create mode 100755 source4/scripting/devel/wintest/test-howto.py
rename source4/scripting/devel/{howto => wintest}/tridge.conf (100%)
create mode 100644 source4/scripting/devel/wintest/wintest.py
Changeset truncated at 500 lines:
diff --git a/source4/scripting/devel/howto/test-howto.py b/source4/scripting/devel/howto/test-howto.py
deleted file mode 100755
index 955509f..0000000
--- a/source4/scripting/devel/howto/test-howto.py
+++ /dev/null
@@ -1,700 +0,0 @@
-#!/usr/bin/env python
-
-'''automated testing of the steps of the Samba4 HOWTO'''
-
-import pexpect, subprocess
-import sys, os, time
-import optparse
-
-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():
- print("Checking prerequesites")
- vars['HOSTNAME'] = 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"])
-
-def build_s4(prefix=None):
- '''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():
- '''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):
- print('Starting Samba4')
- chdir(prefix)
- run_cmd('killall -9 -q samba smbd nmbd winbindd', checkfail=False)
- run_cmd(['sbin/samba',
- '--option', 'panic action=gnome-terminal -e "gdb --pid %PID%"',
- '--option', 'interfaces=%s' % interfaces])
- port_wait("localhost", 445)
-
-def test_smbclient():
- 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}')
- child.expect("smb:")
- child.sendline("dir")
- child.expect("blocks available")
- child.sendline("mkdir testdir")
- child.expect("smb:")
- child.sendline("cd testdir")
- child.expect('testdir')
- child.sendline("cd ..")
- child.sendline("rmdir testdir")
-
-def create_shares():
- print("Adding test shares")
- chdir('${PREFIX}')
- f = open("etc/smb.conf", mode='a')
- f.write(substitute('''
-[test]
- path = ${PREFIX}/test
- read only = no
-[profiles]
- path = ${PREFIX}/var/profiles
- read only = no
- '''))
- f.close()
- run_cmd("mkdir -p test")
- run_cmd("mkdir -p var/profiles")
-
-
-def restart_bind():
- 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():
- print("Testing DNS")
- 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}.",
- ['_kerberos._udp.${LCREALM} has SRV record 0 100 88 ${HOSTNAME}.${LCREALM}'])
- 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():
- print("Testing kerberos")
- run_cmd("kdestroy")
- do_kinit("administrator@${REALM}", "${PASSWORD1}")
- 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 join_win7():
- 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}")
- 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)
-
-
-def test_win7():
- 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}")
- child.sendline("net use t: \\\\${HOSTNAME}.${LCREALM}\\test")
- child.expect("The command completed successfully")
- vm_poweroff("${WINDOWS7_VM}")
-
-
-def join_w2k8():
- 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}")
- child.sendline("copy /Y con answers.txt")
- child.sendline('''
-[DCInstall]
-ReplicaOrNewDomain=Replica
-ReplicaDomainDNSName=${LCREALM}
-SiteName=Default-First-Site-Name
-InstallDNS=No
-ConfirmGc=Yes
-CreateDNSDelegation=No
-UserDomain=${LCREALM}
-UserName=${LCREALM}\\administrator
-Password=${PASSWORD1}
-DatabasePath="C:\Windows\NTDS"
-LogPath="C:\Windows\NTDS"
-SYSVOLPath="C:\Windows\SYSVOL"
-SafeModeAdminPassword=${PASSWORD1}
-RebootOnCompletion=No
-
-''')
- child.expect("copied.")
- child.sendline("dcpromo /answer:answers.txt")
- i = child.expect(["You must restart this computer", "failed"], timeout=120)
- 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)
-
-
-def test_w2k8():
- 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)
-
- 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'])
-
- do_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"])
-
- cmd_contains("bin/samba-tool drs showrepl ${HOSTNAME} -k yes",
- [ "INBOUND NEIGHBORS",
- "${BASEDN}",
- "Last attempt", "was successful",
- "CN=Schema,CN=Configuration,${BASEDN}",
- "Last attempt", "was successful",
- "OUTBOUND NEIGHBORS",
- "${BASEDN}",
- "Last success",
- "CN=Configuration,${BASEDN}",
- "Last success"],
- ordered=True)
-
- cmd_contains("bin/samba-tool drs showrepl ${WINDOWS_DC1} -k yes",
- [ "INBOUND NEIGHBORS",
- "${BASEDN}",
- "Last attempt", "was successful",
- "CN=Schema,CN=Configuration,${BASEDN}",
- "Last attempt", "was successful",
- "OUTBOUND NEIGHBORS",
- "${BASEDN}",
- "Last success",
- "CN=Schema,CN=Configuration,${BASEDN}",
- "Last success" ],
- ordered=True)
-
- child = open_telnet("${WINDOWS_DC1}", "${DOMAIN}\\administrator", "${PASSWORD1}", set_time=True)
- child.sendline("net use t: \\\\${HOSTNAME}.${LCREALM}\\test")
- child.expect("The command completed successfully")
-
-
- print("Checking if showrepl is happy")
- child.sendline("repadmin /showrepl")
- child.expect("${BASEDN}")
- child.expect("was successful")
- child.expect("CN=Configuration,${BASEDN}")
- child.expect("was successful")
- child.expect("CN=Schema,CN=Configuration,${BASEDN}")
- 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'])
-
- print("Checking if new users on windows propogate to samba")
- child.sendline("net user test3 ${PASSWORD3} /add")
- while True:
- i = child.expect(["The command completed successfully",
- "The directory service was unable to allocate a relative identifier"])
- if i == 0:
- 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'])
-
- print("Checking propogation of user deletion")
- 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}")
-
-
-def join_w2k8_rodc():
- 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}")
- child.sendline("copy /Y con answers.txt")
- child.sendline('''
-[DCInstall]
-ReplicaOrNewDomain=ReadOnlyReplica
-ReplicaDomainDNSName=${LCREALM}
-PasswordReplicationDenied="BUILTIN\Administrators"
-PasswordReplicationDenied="BUILTIN\Server Operators"
-PasswordReplicationDenied="BUILTIN\Backup Operators"
-PasswordReplicationDenied="BUILTIN\Account Operators"
-PasswordReplicationDenied="${DOMAIN}\Denied RODC Password Replication Group"
-PasswordReplicationAllowed="${DOMAIN}\Allowed RODC Password Replication Group"
-DelegatedAdmin="${DOMAIN}\\Administrator"
-SiteName=Default-First-Site-Name
-InstallDNS=No
-ConfirmGc=Yes
-CreateDNSDelegation=No
-UserDomain=${LCREALM}
-UserName=${LCREALM}\\administrator
-Password=${PASSWORD1}
-DatabasePath="C:\Windows\NTDS"
-LogPath="C:\Windows\NTDS"
-SYSVOLPath="C:\Windows\SYSVOL"
-SafeModeAdminPassword=${PASSWORD1}
-RebootOnCompletion=No
-
-''')
- child.expect("copied.")
- child.sendline("dcpromo /answer:answers.txt")
- i = child.expect(["You must restart this computer", "failed"], timeout=120)
- 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)
-
--
Samba Shared Repository
More information about the samba-cvs
mailing list