summaryrefslogtreecommitdiff
path: root/wintest
diff options
context:
space:
mode:
authorJoe Guo <joeg@catalyst.net.nz>2018-07-30 18:21:11 +1200
committerDouglas Bagnall <dbagnall@samba.org>2018-08-24 07:49:30 +0200
commitfd6b2086cbf03d8dd0b46160f345bf7cc5551aeb (patch)
tree101163cf6456ed94237bf4210a39965384494c45 /wintest
parent211c9a5f85bffbb012b4567bad265c9339588fbf (diff)
downloadsamba-fd6b2086cbf03d8dd0b46160f345bf7cc5551aeb.tar.gz
PEP8: fix E303: too many blank lines (2)
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-s4-howto.py1
-rw-r--r--wintest/wintest.py12
2 files changed, 0 insertions, 13 deletions
diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py
index f2cbadfb4b8..705f248ebae 100755
--- a/wintest/test-s4-howto.py
+++ b/wintest/test-s4-howto.py
@@ -350,7 +350,6 @@ RebootOnCompletion=No
t.wait_reboot()
-
def test_dcpromo_rodc(t, vm):
'''test the RODC dcpromo worked'''
t.info("Checking the w2k8 RODC join is OK")
diff --git a/wintest/wintest.py b/wintest/wintest.py
index 6efa0c0340a..cb95bdfbfb8 100644
--- a/wintest/wintest.py
+++ b/wintest/wintest.py
@@ -183,7 +183,6 @@ class wintest():
else:
return subprocess.call(cmd, shell=shell, cwd=dir)
-
def run_child(self, cmd, dir="."):
'''create a child and return the Popen handle to it'''
cwd = os.getcwd()
@@ -409,7 +408,6 @@ zone "%s" IN {
''' % (self.getvar('LCREALM'), self.getvar('INTERFACE_IP')),
mode='a')
-
# add forwarding for the windows domains
domains = self.get_domains()
@@ -426,7 +424,6 @@ zone "%s" IN {
''' % (d, domains[d]),
mode='a')
-
self.write_file("etc/rndc.conf", '''
# Start of rndc.conf
key "rndc-key" {
@@ -441,7 +438,6 @@ options {
};
''')
-
def stop_bind(self):
'''Stop our private BIND from listening and operating'''
self.rndc_cmd("stop", checkfail=False)
@@ -449,7 +445,6 @@ options {
self.run_cmd("rm -rf var/named")
-
def start_bind(self):
'''restart the test environment version of bind'''
self.info("Restarting bind9")
@@ -476,7 +471,6 @@ options {
self.info("restoring /etc/resolv.conf")
self.run_cmd("mv -f %s /etc/resolv.conf" % self.resolv_conf_backup)
-
def vm_poweroff(self, vmname, checkfail=True):
'''power off a VM'''
self.setvar('VMNAME', vmname)
@@ -656,7 +650,6 @@ options {
child.expect([pexpect.EOF, pexpect.TIMEOUT], timeout=5)
return True
-
def resolve_ip(self, hostname, retries=60, delay=5):
'''resolve an IP given a hostname, assuming NBT'''
while retries > 0:
@@ -673,7 +666,6 @@ options {
self.info("retrying (retries=%u delay=%u)" % (retries, delay))
raise RuntimeError("Failed to resolve IP of %s" % hostname)
-
def open_telnet(self, hostname, username, password, retries=60, delay=5, set_time=False, set_ip=False,
disable_firewall=True, run_tlntadmn=True, set_noexpire=False):
'''open a telnet connection to a windows server, return the pexpect child'''
@@ -820,7 +812,6 @@ options {
ret.append(self.vars[v])
return ret
-
def run_dcpromo_as_first_dc(self, vm, func_level=None):
self.setwinvars(vm)
self.info("Configuring a windows VM ${WIN_VM} at the first DC in the domain using dcpromo")
@@ -883,7 +874,6 @@ RebootOnCompletion=No
self.retry_cmd("host -t SRV _ldap._tcp.${WIN_REALM} ${WIN_IP}", ['has SRV record'], retries=60, delay=5)
-
def start_winvm(self, vm):
'''start a Windows VM'''
self.setwinvars(vm)
@@ -915,7 +905,6 @@ RebootOnCompletion=No
child.expect("Registration of the DNS resource records for all adapters of this computer has been initiated. Any errors will be reported in the Event Viewer")
child.expect("C:")
-
def test_remote_smbclient(self, vm, username="${WIN_USER}", password="${WIN_PASS}", args=""):
'''test smbclient against remote server'''
self.setwinvars(vm)
@@ -932,7 +921,6 @@ RebootOnCompletion=No
child.sendline("net use t: \\\\${HOSTNAME}.%s\\test" % realm)
child.expect("The command completed successfully")
-
def setup(self, testname, subdir):
'''setup for main tests, parsing command line'''
self.parser.add_option("--conf", type='string', default='', help='config file')