PEP8: fix E128: continuation line under-indented for visual indent

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>

3 files changed, 61 insertions, 61 deletions

diff --git a/wintest/test-s3.py b/wintest/test-s3.py
index 9f1fc9da1b4..3272f277eaa 100755
--- a/wintest/test-s3.py
+++ b/wintest/test-s3.py
@@ -157,7 +157,7 @@ def join_as_member(t, vm):
     t.cmd_contains("bin/net ads testjoin", ["Join is OK"])
     t.cmd_contains("bin/net ads dns register ${HOSTNAME}.${WIN_REALM} -P", ["Successfully registered hostname with DNS"])
     t.cmd_contains("host -t A ${HOSTNAME}.${WIN_REALM}",
-                 ['${HOSTNAME}.${WIN_REALM} has address'])
+                   ['${HOSTNAME}.${WIN_REALM} has address'])
 
 def create_root_account(t, vm):
     t.setwinvars(vm)
diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py
index e8f2111fafa..dae8e17be90 100755
--- a/wintest/test-s4-howto.py
+++ b/wintest/test-s4-howto.py
@@ -57,7 +57,7 @@ def start_s4(t):
     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 %d"', '--option', 'max protocol=nt1'])
+               '--option', 'panic action=gnome-terminal -e "gdb --pid %d"', '--option', 'max protocol=nt1'])
     t.port_wait("${INTERFACE_IP}", 139)
 
 def test_smbclient(t):
@@ -100,11 +100,11 @@ def test_dns(t):
     '''test that DNS is OK'''
     t.info("Testing DNS")
     t.cmd_contains("host -t SRV _ldap._tcp.${LCREALM}.",
-                 ['_ldap._tcp.${LCREALM} has SRV record 0 100 389 ${HOSTNAME}.${LCREALM}'])
+                   ['_ldap._tcp.${LCREALM} has SRV record 0 100 389 ${HOSTNAME}.${LCREALM}'])
     t.cmd_contains("host -t SRV  _kerberos._udp.${LCREALM}.",
-                 ['_kerberos._udp.${LCREALM} has SRV record 0 100 88 ${HOSTNAME}.${LCREALM}'])
+                   ['_kerberos._udp.${LCREALM} has SRV record 0 100 88 ${HOSTNAME}.${LCREALM}'])
     t.cmd_contains("host -t A ${HOSTNAME}.${LCREALM}",
-                 ['${HOSTNAME}.${LCREALM} has address'])
+                   ['${HOSTNAME}.${LCREALM} has address'])
 
 def test_kerberos(t):
     '''test that kerberos is OK'''
@@ -211,38 +211,38 @@ def test_dcpromo(t, vm):
         t.cmd_contains("bin/samba-tool drs replicate ${WIN_HOSTNAME}.${LCREALM} ${HOSTNAME}.${LCREALM} %s -k yes" % nc, ["was successful"])
 
     t.cmd_contains("bin/samba-tool drs showrepl ${HOSTNAME}.${LCREALM} -k yes",
-                 [ "INBOUND NEIGHBORS",
-                   "${BASEDN}",
-                   "Last attempt .* was successful",
-                   "CN=Configuration,${BASEDN}",
-                   "Last attempt .* was successful",
-                   "CN=Configuration,${BASEDN}", # cope with either order
-                   "Last attempt .* was successful",
-                   "OUTBOUND NEIGHBORS",
-                   "${BASEDN}",
-                   "Last success",
-                   "CN=Configuration,${BASEDN}",
-                   "Last success",
-                   "CN=Configuration,${BASEDN}",
-                   "Last success"],
+                   [ "INBOUND NEIGHBORS",
+                     "${BASEDN}",
+                     "Last attempt .* was successful",
+                     "CN=Configuration,${BASEDN}",
+                     "Last attempt .* was successful",
+                     "CN=Configuration,${BASEDN}", # cope with either order
+                     "Last attempt .* was successful",
+                     "OUTBOUND NEIGHBORS",
+                     "${BASEDN}",
+                     "Last success",
+                     "CN=Configuration,${BASEDN}",
+                     "Last success",
+                     "CN=Configuration,${BASEDN}",
+                     "Last success"],
                    ordered=True,
                    regex=True)
 
     t.cmd_contains("bin/samba-tool drs showrepl ${WIN_HOSTNAME}.${LCREALM} -k yes",
-                 [ "INBOUND NEIGHBORS",
-                   "${BASEDN}",
-                   "Last attempt .* was successful",
-                   "CN=Configuration,${BASEDN}",
-                   "Last attempt .* was successful",
-                   "CN=Configuration,${BASEDN}",
-                   "Last attempt .* was successful",
-                   "OUTBOUND NEIGHBORS",
-                   "${BASEDN}",
-                   "Last success",
-                   "CN=Configuration,${BASEDN}",
-                   "Last success",
-                   "CN=Configuration,${BASEDN}",
-                   "Last success" ],
+                   [ "INBOUND NEIGHBORS",
+                     "${BASEDN}",
+                     "Last attempt .* was successful",
+                     "CN=Configuration,${BASEDN}",
+                     "Last attempt .* was successful",
+                     "CN=Configuration,${BASEDN}",
+                     "Last attempt .* was successful",
+                     "OUTBOUND NEIGHBORS",
+                     "${BASEDN}",
+                     "Last success",
+                     "CN=Configuration,${BASEDN}",
+                     "Last success",
+                     "CN=Configuration,${BASEDN}",
+                     "Last success" ],
                    ordered=True,
                    regex=True)
 
@@ -373,14 +373,14 @@ def test_dcpromo_rodc(t, vm):
         t.cmd_contains("bin/samba-tool drs replicate --add-ref ${WIN_HOSTNAME}.${LCREALM} ${HOSTNAME}.${LCREALM} %s" % nc, ["was successful"])
 
     t.cmd_contains("bin/samba-tool drs showrepl ${HOSTNAME}.${LCREALM}",
-                 [ "INBOUND NEIGHBORS",
-                   "OUTBOUND NEIGHBORS",
-                   "${BASEDN}",
-                   "Last attempt.*was successful",
-                   "CN=Configuration,${BASEDN}",
-                   "Last attempt.*was successful",
-                   "CN=Configuration,${BASEDN}",
-                   "Last attempt.*was successful" ],
+                   [ "INBOUND NEIGHBORS",
+                     "OUTBOUND NEIGHBORS",
+                     "${BASEDN}",
+                     "Last attempt.*was successful",
+                     "CN=Configuration,${BASEDN}",
+                     "Last attempt.*was successful",
+                     "CN=Configuration,${BASEDN}",
+                     "Last attempt.*was successful" ],
                    ordered=True,
                    regex=True)
 
@@ -527,14 +527,14 @@ def test_join_as_rodc(t, vm):
     child.expect("DSA invocationID")
 
     t.cmd_contains("bin/samba-tool drs showrepl ${WIN_HOSTNAME}.${WIN_REALM} -k yes",
-                 [ "INBOUND NEIGHBORS",
-                   "OUTBOUND NEIGHBORS",
-                   "${WIN_BASEDN}",
-                   "Last attempt .* was successful",
-                   "CN=Configuration,${WIN_BASEDN}",
-                   "Last attempt .* was successful",
-                   "CN=Configuration,${WIN_BASEDN}",
-                   "Last attempt .* was successful" ],
+                   [ "INBOUND NEIGHBORS",
+                     "OUTBOUND NEIGHBORS",
+                     "${WIN_BASEDN}",
+                     "Last attempt .* was successful",
+                     "CN=Configuration,${WIN_BASEDN}",
+                     "Last attempt .* was successful",
+                     "CN=Configuration,${WIN_BASEDN}",
+                     "Last attempt .* was successful" ],
                    ordered=True,
                    regex=True)
 
diff --git a/wintest/wintest.py b/wintest/wintest.py
index 9e3a66ef025..bd6d6ae4dca 100644
--- a/wintest/wintest.py
+++ b/wintest/wintest.py
@@ -302,7 +302,7 @@ class wintest():
     def named_supports_gssapi_keytab(self):
         '''see if named supports tkey-gssapi-keytab'''
         self.write_file("${PREFIX}/named.conf.test",
-                     'options { tkey-gssapi-keytab "test"; };')
+                        'options { tkey-gssapi-keytab "test"; };')
         try:
             self.run_cmd("${NAMED_CHECKCONF} ${PREFIX}/named.conf.test")
         except subprocess.CalledProcessError:
@@ -341,11 +341,11 @@ nameserver %s
         elif self.getvar('NAMESERVER_BACKEND') != 'SAMBA_INTERNAL':
             if self.named_supports_gssapi_keytab():
                 self.setvar("NAMED_TKEY_OPTION",
-                         'tkey-gssapi-keytab "${PREFIX}/bind-dns/dns.keytab";')
+                            'tkey-gssapi-keytab "${PREFIX}/bind-dns/dns.keytab";')
             else:
                 self.info("LCREALM=${LCREALM}")
                 self.setvar("NAMED_TKEY_OPTION",
-                         '''tkey-gssapi-credential "DNS/${LCREALM}";
+                            '''tkey-gssapi-credential "DNS/${LCREALM}";
                             tkey-domain "${LCREALM}";
                  ''')
             self.putenv('KEYTAB_FILE', '${PREFIX}/bind-dns/dns.keytab')
@@ -397,7 +397,7 @@ ${NAMED_INCLUDE}
 
         if self.getvar('NAMESERVER_BACKEND') == 'SAMBA_INTERNAL':
             self.write_file('etc/named.conf',
-                       '''
+                            '''
 zone "%s" IN {
       type forward;
       forward only;
@@ -414,7 +414,7 @@ zone "%s" IN {
 
         for d in domains:
             self.write_file('etc/named.conf',
-                         '''
+                            '''
 zone "%s" IN {
       type forward;
       forward only;
@@ -900,7 +900,7 @@ RebootOnCompletion=No
             child.expect("C:")
             child.sendline("netdom join ${WIN_HOSTNAME} /Domain:%s /UserD:%s /PasswordD:%s" % (domain, username, password))
             i = child.expect(["The command completed successfully", 
-                             "The specified domain either does not exist or could not be contacted."], timeout=120)
+                              "The specified domain either does not exist or could not be contacted."], timeout=120)
             if i == 0:
                 break
             time.sleep(10)
@@ -945,12 +945,12 @@ RebootOnCompletion=No
         self.parser.add_option("--nocleanup", action='store_true', default=False, help='disable cleanup code')
         self.parser.add_option("--use-ntvfs", action='store_true', default=False, help='use NTVFS for the fileserver')
         self.parser.add_option("--dns-backend", type="choice",
-            choices=["SAMBA_INTERNAL", "BIND9_FLATFILE", "BIND9_DLZ", "NONE"],
-            help="The DNS server backend. SAMBA_INTERNAL is the builtin name server (default), " \
-                 "BIND9_FLATFILE uses bind9 text database to store zone information, " \
-                 "BIND9_DLZ uses samba4 AD to store zone information, " \
-                 "NONE skips the DNS setup entirely (not recommended)",
-            default="SAMBA_INTERNAL")
+                               choices=["SAMBA_INTERNAL", "BIND9_FLATFILE", "BIND9_DLZ", "NONE"],
+                               help="The DNS server backend. SAMBA_INTERNAL is the builtin name server (default), " \
+                               "BIND9_FLATFILE uses bind9 text database to store zone information, " \
+                               "BIND9_DLZ uses samba4 AD to store zone information, " \
+                               "NONE skips the DNS setup entirely (not recommended)",
+                               default="SAMBA_INTERNAL")
 
         self.opts, self.args = self.parser.parse_args()