summaryrefslogtreecommitdiff
path: root/wintest
diff options
context:
space:
mode:
authorJoe Guo <joeg@catalyst.net.nz>2018-07-30 18:20:39 +1200
committerDouglas Bagnall <dbagnall@samba.org>2018-08-24 07:49:29 +0200
commit211c9a5f85bffbb012b4567bad265c9339588fbf (patch)
treed22f062161bdd07b60c6ac3bd42964ea902a402b /wintest
parent542e91ef9222302303d2ecc10dceb96d1b0d5bab (diff)
downloadsamba-211c9a5f85bffbb012b4567bad265c9339588fbf.tar.gz
PEP8: fix E302: expected 2 blank lines, found 1
Signed-off-by: Joe Guo <joeg@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Diffstat (limited to 'wintest')
-rwxr-xr-xwintest/test-s3.py9
-rwxr-xr-xwintest/test-s4-howto.py6
-rw-r--r--wintest/wintest.py1
3 files changed, 16 insertions, 0 deletions
diff --git a/wintest/test-s3.py b/wintest/test-s3.py
index 145aed96cb8..d1139b603c6 100755
--- a/wintest/test-s3.py
+++ b/wintest/test-s3.py
@@ -6,9 +6,11 @@ import sys, os
import optparse
import wintest
+
def set_libpath(t):
t.putenv("LD_LIBRARY_PATH", "${PREFIX}/lib")
+
def set_krb5_conf(t):
t.run_cmd("mkdir -p ${PREFIX}/etc")
t.write_file("${PREFIX}/etc/krb5.conf",
@@ -18,6 +20,7 @@ def set_krb5_conf(t):
t.putenv("KRB5_CONFIG", '${PREFIX}/etc/krb5.conf')
+
def build_s3(t):
'''build samba3'''
t.info('Building s3')
@@ -30,6 +33,7 @@ def build_s3(t):
t.run_cmd('rm -rf ${PREFIX}')
t.run_cmd('make install')
+
def start_s3(t):
t.info('Starting Samba3')
t.chdir("${PREFIX}")
@@ -40,6 +44,7 @@ def start_s3(t):
t.run_cmd(['sbin/smbd', "-D"])
t.port_wait("${INTERFACE_IP}", 139)
+
def test_wbinfo(t):
t.info('Testing wbinfo')
t.chdir('${PREFIX}')
@@ -103,6 +108,7 @@ def test_smbclient(t):
child.sendline("cd ..")
child.sendline("rmdir testdir")
+
def create_shares(t):
t.info("Adding test shares")
t.chdir('${PREFIX}')
@@ -147,6 +153,7 @@ def prep_join_as_member(t, vm):
panic action = xterm -e gdb --pid %d
''')
+
def join_as_member(t, vm):
'''join a windows domain as a member server'''
t.setwinvars(vm)
@@ -159,6 +166,7 @@ def join_as_member(t, vm):
t.cmd_contains("host -t A ${HOSTNAME}.${WIN_REALM}",
['${HOSTNAME}.${WIN_REALM} has address'])
+
def create_root_account(t, vm):
t.setwinvars(vm)
t.info("Creating 'root' account for testing Samba3 member server")
@@ -174,6 +182,7 @@ def create_root_account(t, vm):
child.sendline("user edit disabled root no")
child.expect("Set root's disabled flag")
+
def test_join_as_member(t, vm):
'''test the domain join'''
t.setwinvars(vm)
diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py
index 0157fc73a9f..f2cbadfb4b8 100755
--- a/wintest/test-s4-howto.py
+++ b/wintest/test-s4-howto.py
@@ -5,9 +5,11 @@
import sys, os
import wintest, pexpect, time, subprocess
+
def set_krb5_conf(t):
t.putenv("KRB5_CONFIG", '${PREFIX}/private/krb5.conf')
+
def build_s4(t):
'''build samba4'''
t.info('Building s4')
@@ -60,6 +62,7 @@ def start_s4(t):
'--option', 'panic action=gnome-terminal -e "gdb --pid %d"', '--option', 'max protocol=nt1'])
t.port_wait("${INTERFACE_IP}", 139)
+
def test_smbclient(t):
'''test smbclient against localhost'''
t.info('Testing smbclient')
@@ -106,6 +109,7 @@ def test_dns(t):
t.cmd_contains("host -t A ${HOSTNAME}.${LCREALM}",
['${HOSTNAME}.${LCREALM} has address'])
+
def test_kerberos(t):
'''test that kerberos is OK'''
t.info("Testing kerberos")
@@ -129,6 +133,7 @@ def run_winjoin(t, vm):
t.run_winjoin(t, "${LCREALM}")
+
def test_winjoin(t, vm):
t.info("Checking the windows join is OK")
smbclient = t.getvar("smbclient")
@@ -406,6 +411,7 @@ def prep_join_as_dc(t, vm):
child = t.open_telnet("${WIN_HOSTNAME}", "${WIN_DOMAIN}\\administrator", "${WIN_PASS}", set_time=True)
t.get_ipconfig(child)
+
def join_as_dc(t, vm):
'''join a windows domain as a DC'''
t.setwinvars(vm)
diff --git a/wintest/wintest.py b/wintest/wintest.py
index 3c7ac553c5b..6efa0c0340a 100644
--- a/wintest/wintest.py
+++ b/wintest/wintest.py
@@ -6,6 +6,7 @@ import pexpect, subprocess
import optparse
import sys, os, time, re
+
class wintest():
'''testing of Samba against windows VMs'''