python: tests: update all super calls to python 3 style in tests
authorRob van der Linde <rob@catalyst.net.nz>
Tue, 28 Nov 2023 03:38:22 +0000 (16:38 +1300)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 30 Nov 2023 01:05:32 +0000 (01:05 +0000)
Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
[abartlet@samba.org Some python2 style super() calls remain due
 to being an actual, even if reasonable, behaviour change]

129 files changed:
python/samba/tests/__init__.py
python/samba/tests/audit_log_base.py
python/samba/tests/audit_log_dsdb.py
python/samba/tests/audit_log_pass_change.py
python/samba/tests/auth.py
python/samba/tests/auth_log.py
python/samba/tests/auth_log_base.py
python/samba/tests/auth_log_ncalrpc.py
python/samba/tests/auth_log_netlogon.py
python/samba/tests/auth_log_netlogon_bad_creds.py
python/samba/tests/auth_log_pass_change.py
python/samba/tests/auth_log_samlogon.py
python/samba/tests/auth_log_winbind.py
python/samba/tests/blackbox/bug13653.py
python/samba/tests/blackbox/downgradedatabase.py
python/samba/tests/blackbox/mdsearch.py
python/samba/tests/blackbox/netads_dns.py
python/samba/tests/blackbox/samba_dnsupdate.py
python/samba/tests/blackbox/smbcacls.py
python/samba/tests/blackbox/smbcacls_propagate_inhertance.py
python/samba/tests/blackbox/smbcacls_save_restore.py
python/samba/tests/blackbox/smbcontrol.py
python/samba/tests/blackbox/smbcontrol_process.py
python/samba/tests/complex_expressions.py
python/samba/tests/cred_opt.py
python/samba/tests/credentials.py
python/samba/tests/dcerpc/array.py
python/samba/tests/dcerpc/dnsserver.py
python/samba/tests/dcerpc/mdssvc.py
python/samba/tests/dcerpc/raw_protocol.py
python/samba/tests/dcerpc/raw_testcase.py
python/samba/tests/dcerpc/registry.py
python/samba/tests/dcerpc/rpcecho.py
python/samba/tests/dcerpc/sam.py
python/samba/tests/dcerpc/samr_change_password.py
python/samba/tests/dcerpc/srvsvc.py
python/samba/tests/dcerpc/string_tests.py
python/samba/tests/dcerpc/unix.py
python/samba/tests/dckeytab.py
python/samba/tests/dns.py
python/samba/tests/dns_base.py
python/samba/tests/dns_forwarder.py
python/samba/tests/dns_forwarder_helpers/server.py
python/samba/tests/dns_invalid.py
python/samba/tests/dns_tkey.py
python/samba/tests/dns_wildcard.py
python/samba/tests/docs.py
python/samba/tests/domain_backup.py
python/samba/tests/dsdb.py
python/samba/tests/dsdb_schema_attributes.py
python/samba/tests/emulate/traffic_packet.py
python/samba/tests/encrypted_secrets.py
python/samba/tests/gensec.py
python/samba/tests/gpo.py
python/samba/tests/gpo_member.py
python/samba/tests/graph.py
python/samba/tests/group_audit.py
python/samba/tests/join.py
python/samba/tests/kcc/__init__.py
python/samba/tests/kcc/graph_utils.py
python/samba/tests/kcc/ldif_import_export.py
python/samba/tests/krb5/as_req_tests.py
python/samba/tests/krb5/kdc_tests.py
python/samba/tests/krb5/raw_testcase.py
python/samba/tests/krb5/s4u_tests.py
python/samba/tests/krb5/simple_tests.py
python/samba/tests/krb5/xrealm_tests.py
python/samba/tests/krb5_credentials.py
python/samba/tests/ldap_raw.py
python/samba/tests/net_join.py
python/samba/tests/net_join_no_spnego.py
python/samba/tests/netbios.py
python/samba/tests/netlogonsvc.py
python/samba/tests/ntacls.py
python/samba/tests/ntacls_backup.py
python/samba/tests/ntlm_auth.py
python/samba/tests/ntlm_auth_base.py
python/samba/tests/ntlm_auth_krb5.py
python/samba/tests/ntlmdisabled.py
python/samba/tests/param.py
python/samba/tests/password_hash.py
python/samba/tests/posixacl.py
python/samba/tests/prefork_restart.py
python/samba/tests/py_credentials.py
python/samba/tests/registry.py
python/samba/tests/s3_net_join.py
python/samba/tests/s3idmapdb.py
python/samba/tests/s3param.py
python/samba/tests/s3passdb.py
python/samba/tests/s3registry.py
python/samba/tests/s3windb.py
python/samba/tests/samba3sam.py
python/samba/tests/samba_tool/computer.py
python/samba/tests/samba_tool/contact.py
python/samba/tests/samba_tool/demote.py
python/samba/tests/samba_tool/dnscmd.py
python/samba/tests/samba_tool/drs_clone_dc_data_lmdb_size.py
python/samba/tests/samba_tool/dsacl.py
python/samba/tests/samba_tool/forest.py
python/samba/tests/samba_tool/gpo.py
python/samba/tests/samba_tool/gpo_exts.py
python/samba/tests/samba_tool/group.py
python/samba/tests/samba_tool/join_lmdb_size.py
python/samba/tests/samba_tool/ou.py
python/samba/tests/samba_tool/passwordsettings.py
python/samba/tests/samba_tool/promote_dc_lmdb_size.py
python/samba/tests/samba_tool/provision_lmdb_size.py
python/samba/tests/samba_tool/provision_password_check.py
python/samba/tests/samba_tool/provision_userPassword_crypt.py
python/samba/tests/samba_tool/rodc.py
python/samba/tests/samba_tool/schema.py
python/samba/tests/samba_tool/sites.py
python/samba/tests/samba_tool/user.py
python/samba/tests/samba_tool/user_check_password_script.py
python/samba/tests/samba_tool/user_virtualCryptSHA.py
python/samba/tests/samba_tool/user_virtualCryptSHA_base.py
python/samba/tests/samba_tool/user_wdigest.py
python/samba/tests/samba_tool/visualize.py
python/samba/tests/samba_upgradedns_lmdb.py
python/samba/tests/samdb.py
python/samba/tests/samdb_api.py
python/samba/tests/security.py
python/samba/tests/smb-notify.py
python/samba/tests/smb.py
python/samba/tests/smb3unix.py
python/samba/tests/smbd_base.py
python/samba/tests/subunitrun.py
python/samba/tests/upgradeprovision.py
python/samba/tests/upgradeprovisionneeddc.py

index 9981e1390a282e8d9094724df9c542a510799a2b..c55525b2902c604f009b397f54e69b17873b0ee4 100644 (file)
@@ -185,7 +185,7 @@ class TestCase(unittest.TestCase):
         return "".join([name[0].lower(), name[1:]])
 
     def setUp(self):
-        super(TestCase, self).setUp()
+        super().setUp()
         test_debug_level = os.getenv("TEST_DEBUG_LEVEL")
         if test_debug_level is not None:
             test_debug_level = int(test_debug_level)
@@ -326,7 +326,7 @@ class LdbTestCase(TestCase):
     """Trivial test case for running tests against a LDB."""
 
     def setUp(self):
-        super(LdbTestCase, self).setUp()
+        super().setUp()
         self.tempfile = tempfile.NamedTemporaryFile(delete=False)
         self.filename = self.tempfile.name
         self.ldb = samba.Ldb(self.filename)
@@ -345,7 +345,7 @@ class LdbTestCase(TestCase):
 class TestCaseInTempDir(TestCase):
 
     def setUp(self):
-        super(TestCaseInTempDir, self).setUp()
+        super().setUp()
         self.tempdir = tempfile.mkdtemp()
         self.addCleanup(self._remove_tempdir)
 
index 73d0d8e306cdb8a8a41bb3b31eaf509ab39528af..fa5ecc7cace39e9948b773aa5e9e85d92102b9f5 100644 (file)
@@ -39,7 +39,7 @@ def getAudit(message):
 class AuditLogTestBase(samba.tests.TestCase):
 
     def setUp(self):
-        super(AuditLogTestBase, self).setUp()
+        super().setUp()
 
         # connect to the server's messaging bus (we need to explicitly load a
         # different smb.conf here, because in all other respects this test
index 0985096173194a10575076f3e2e7c1edff8251bd..af623376cd16f845fd89cac672ada6d65167bf5f 100644 (file)
@@ -40,7 +40,7 @@ class AuditLogDsdbTests(AuditLogTestBase):
     def setUp(self):
         self.message_type = MSG_DSDB_LOG
         self.event_type = DSDB_EVENT_NAME
-        super(AuditLogDsdbTests, self).setUp()
+        super().setUp()
 
         self.server_ip = os.environ["SERVER_IP"]
 
@@ -92,7 +92,7 @@ class AuditLogDsdbTests(AuditLogTestBase):
 
     def tearDown(self):
         self.discardMessages()
-        super(AuditLogDsdbTests, self).tearDown()
+        super().tearDown()
 
     def haveExpectedTxn(self, expected):
         if self.context["txnMessage"] is not None:
index 25fe2b5664ad850dea03ec1b0c0a10273046a981..1039e17a1807d46c351d65d6d18012f0d6abc3fa 100644 (file)
@@ -45,7 +45,7 @@ class AuditLogPassChangeTests(AuditLogTestBase):
     def setUp(self):
         self.message_type = MSG_DSDB_PWD_LOG
         self.event_type = DSDB_PWD_EVENT_NAME
-        super(AuditLogPassChangeTests, self).setUp()
+        super().setUp()
 
         self.server_ip = os.environ["SERVER_IP"]
 
index 099826e0c62e68b380c4ff88a248a7572285c576..3fedd5ec37f54b766686bfc829fffd016a515f74 100644 (file)
@@ -28,7 +28,7 @@ import samba.tests
 class AuthSystemSessionTests(samba.tests.TestCase):
 
     def setUp(self):
-        super(AuthSystemSessionTests, self).setUp()
+        super().setUp()
         self.system_session = auth.system_session()
         self.lp = samba.tests.env_loadparm()
 
@@ -62,7 +62,7 @@ class AuthSystemSessionTests(samba.tests.TestCase):
 class AuthAdminSessionTests(samba.tests.TestCase):
 
     def setUp(self):
-        super(AuthAdminSessionTests, self).setUp()
+        super().setUp()
         self.lp = samba.tests.env_loadparm()
         self.admin_session = auth.admin_session(self.lp,
                                                 "S-1-5-21-2212615479-2695158682-2101375467")
index 41e7767b75cdcdcf6400660197b57d79fefea2df..0307ed0d86dbbc3a1ec971106a3b55caf6d32344 100755 (executable)
@@ -47,7 +47,7 @@ import re
 class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase):
 
     def setUp(self):
-        super(AuthLogTests, self).setUp()
+        super().setUp()
         self.remoteAddress = os.environ["CLIENT_IP"]
 
     def smb_connection(self, creds, use_spnego="yes", ntlmv2_auth="yes",
index 36304ecf79685654e9e2543a5de692a448060431..131f019de43cd5e11d9feafab47b3da04637e597 100644 (file)
@@ -100,7 +100,7 @@ class AuthLogTestBase(samba.tests.TestCase):
         super().tearDownClass()
 
     def setUp(self):
-        super(AuthLogTestBase, self).setUp()
+        super().setUp()
         type(self).discardMessages()
 
     def isRemote(self, message):
index 0941a64571b11acc96f9d7436fdf68b1971ac1f0..c671556afe20de95bcfdd5e68ecb9991069e2617 100644 (file)
@@ -32,7 +32,7 @@ from samba.dcerpc.windows_event_ids import (
 class AuthLogTestsNcalrpc(samba.tests.auth_log_base.AuthLogTestBase):
 
     def setUp(self):
-        super(AuthLogTestsNcalrpc, self).setUp()
+        super().setUp()
         self.remoteAddress = AS_SYSTEM_MAGIC_PATH_TOKEN
 
     def _test_rpc_ncaclrpc(self, authTypes, binding, creds,
index eabc4239a42b796838891d11634ff7d4389a49a5..ac7e284b4fc85524005d3738a649ff86b67c867b 100644 (file)
@@ -44,7 +44,7 @@ from samba.dcerpc.windows_event_ids import (
 class AuthLogTestsNetLogon(samba.tests.auth_log_base.AuthLogTestBase):
 
     def setUp(self):
-        super(AuthLogTestsNetLogon, self).setUp()
+        super().setUp()
         self.lp = samba.tests.env_loadparm()
         self.session = system_session()
         self.ldb = SamDB(
@@ -68,7 +68,7 @@ class AuthLogTestsNetLogon(samba.tests.auth_log_base.AuthLogTestBase):
             "unicodePwd": utf16pw})
 
     def tearDown(self):
-        super(AuthLogTestsNetLogon, self).tearDown()
+        super().tearDown()
         delete_force(self.ldb, self.dn)
 
     def _test_netlogon(self, binding, checkFunction):
index a74ea5c706d9c550333dbe473cac4ff1182f4b72..e97ca851d110469eb3f1e3f21a0e598630416e7e 100644 (file)
@@ -47,7 +47,7 @@ from samba.dcerpc.windows_event_ids import (
 class AuthLogTestsNetLogonBadCreds(samba.tests.auth_log_base.AuthLogTestBase):
 
     def setUp(self):
-        super(AuthLogTestsNetLogonBadCreds, self).setUp()
+        super().setUp()
         self.lp = samba.tests.env_loadparm()
         self.session = system_session()
         self.ldb = SamDB(
@@ -71,7 +71,7 @@ class AuthLogTestsNetLogonBadCreds(samba.tests.auth_log_base.AuthLogTestBase):
             "unicodePwd": utf16pw})
 
     def tearDown(self):
-        super(AuthLogTestsNetLogonBadCreds, self).tearDown()
+        super().tearDown()
         delete_force(self.ldb, self.dn)
 
     def _test_netlogon(self, name, pwd, status, checkFunction, event_id):
index a9dc2b328d4583ad76a972be0d47852a4fc4c17f..29a9e38db1d7a7e91ca42c9e9d9ac1b65813455d 100644 (file)
@@ -41,7 +41,7 @@ USER_PASS = samba.generate_random_password(32, 32)
 class AuthLogPassChangeTests(samba.tests.auth_log_base.AuthLogTestBase):
 
     def setUp(self):
-        super(AuthLogPassChangeTests, self).setUp()
+        super().setUp()
 
         self.server_ip = os.environ["SERVER_IP"]
 
index 8e86c646a008909202405df742fadf0e0cea9435..f3dfebab0cc26c6d46c438319a5c0b13dd6d8d75 100644 (file)
@@ -44,7 +44,7 @@ from samba.dcerpc.windows_event_ids import (
 class AuthLogTestsSamLogon(samba.tests.auth_log_base.AuthLogTestBase):
 
     def setUp(self):
-        super(AuthLogTestsSamLogon, self).setUp()
+        super().setUp()
         self.lp = samba.tests.env_loadparm()
         self.session = system_session()
         self.ldb = SamDB(
@@ -60,7 +60,7 @@ class AuthLogTestsSamLogon(samba.tests.auth_log_base.AuthLogTestBase):
                            (self.netbios_name, self.base_dn))
 
     def tearDown(self):
-        super(AuthLogTestsSamLogon, self).tearDown()
+        super().tearDown()
         delete_force(self.ldb, self.samlogon_dn)
 
     def _test_samlogon(self, binding, creds, checkFunction):
index 555d5348303aae4a69c61604b2992855e28b68be..1445eff698436e459bb75b0fd0d648efa6053106 100644 (file)
@@ -120,7 +120,7 @@ class AuthLogTestsWinbind(AuthLogTestBase, BlackboxTestCase):
         return list(filter(keep, messages))
 
     def setUp(self):
-        super(AuthLogTestsWinbind, self).setUp()
+        super().setUp()
         self.domain = os.environ["DOMAIN"]
         self.host = os.environ["SERVER"]
         self.dc = os.environ["DC_SERVER"]
@@ -138,7 +138,7 @@ class AuthLogTestsWinbind(AuthLogTestBase, BlackboxTestCase):
         self.remoteAddress = ''
 
     def tearDown(self):
-        super(AuthLogTestsWinbind, self).tearDown()
+        super().tearDown()
         delete_force(self.ldb, self.user_dn)
 
     #
index 79b0af85ca1005c62e80ba789d85c21b4b3778dc..215b9fcc3780e6d516ddf9ebc4dca5685b46eb38 100644 (file)
@@ -128,7 +128,7 @@ class Bug13653Tests(BlackboxTestCase):
     # Open a local connection to the SamDB
     # and load configuration from the OS environment.
     def setUp(self):
-        super(Bug13653Tests, self).setUp()
+        super().setUp()
         self.env = os.environ["TEST_ENV"]
         self.server = os.environ["SERVER"]
         self.prefix = os.environ["PREFIX_ABS"]
@@ -143,7 +143,7 @@ class Bug13653Tests(BlackboxTestCase):
     # Delete the user account created by the test case.
     # The user name is in self.user
     def tearDown(self):
-        super(Bug13653Tests, self).tearDown()
+        super().tearDown()
         try:
             dn = "CN=%s,CN=Users,%s" % (self.user, self.ldb.domain_dn())
             delete_force(self.ldb, dn)
index e4d772be83ee0982ee8f27624a83cdae4543cdfb..d850d1b5527eb035d4b8492225f603c41647f41a 100644 (file)
@@ -29,7 +29,7 @@ class DowngradeTestBase(BlackboxTestCase):
     """Test that sambadowngradedatabase downgrades the samba database"""
 
     def setUp(self):
-        super(DowngradeTestBase, self).setUp()
+        super().setUp()
         if not hasattr(self, "backend"):
             self.fail("Subclass this class and set 'backend'")
 
@@ -62,7 +62,7 @@ class DowngradeTestBase(BlackboxTestCase):
                      "bind-dns",
                      "msg.lock")
         self.rm_files("names.tdb", "gencache.tdb")
-        super(DowngradeTestBase, self).tearDown()
+        super().tearDown()
 
     # Parse out the comments above each record that ldbdump produces
     # containing pack format version and KV level key for each record.
index 46af6f94624d047dacf13c7208de49d3e3be95e6..1f72c4e39487726e68032ca761adafcb9e0ae339 100644 (file)
@@ -65,7 +65,7 @@ class MdssvcHTTPRequestHandler(BaseHTTPRequestHandler):
 class MdfindBlackboxTests(BlackboxTestCase):
 
     def setUp(self):
-        super(MdfindBlackboxTests, self).setUp()
+        super().setUp()
 
         self.server = HTTPServer(('10.53.57.35', 8080),
                                  MdssvcHTTPRequestHandler,
index e9f945eaef91b3647d2e9e3a70bcd08bd445a917..3466344ef4a466460c65046f175c858e26d9a58f 100644 (file)
@@ -28,7 +28,7 @@ COMMAND = "bin/net ads"
 class NetAdsDnsTests(BlackboxTestCase):
 
     def setUp(self):
-        super(NetAdsDnsTests, self).setUp()
+        super().setUp()
         nameserver = os.environ["DC_SERVER_IP"]
         # filename=None will disable reading /etc/resolv.conf. The file might
         # not exist e.g. on build or CI systems.
index 8fcdd207f7324dcd8ac33059019f4cf8c3b86ba5..e326fbb592b664f53afca1106b6d969eaa7801b9 100644 (file)
@@ -32,7 +32,7 @@ class SambaDnsUpdateTests(samba.tests.BlackboxTestCase):
 
     def setUp(self):
         self.server_ip = samba.tests.env_get_var_value("DNS_SERVER_IP")
-        super(SambaDnsUpdateTests, self).setUp()
+        super().setUp()
         try:
             out = self.check_output("samba_dnsupdate --verbose")
             self.assertTrue(b"Looking for DNS entry" in out, out)
index 219ddc243cfd4c235fe7757964dfe2d2116d8982..dd84f52a9bb79914ee3fc4b9ebb5a9ca218347c0 100644 (file)
@@ -25,7 +25,7 @@ import os
 class SmbCaclsBlockboxTestBase(BlackboxTestCase):
 
     def setUp(self):
-        super(SmbCaclsBlockboxTestBase, self).setUp()
+        super().setUp()
         self.lp = s3param.get_context()
         self.server = os.environ["SERVER"]
         self.user = os.environ["USER"]
index 87f4c4f43f5053777088ba7d18d1dda9030d9167..cc13727b8fb6fc357fde7cac84c85c70f3655af4 100644 (file)
@@ -22,7 +22,7 @@ import os
 class InheritanceSmbCaclsTests(SmbCaclsBlockboxTestBase):
 
     def setUp(self):
-        super(InheritanceSmbCaclsTests, self).setUp()
+        super().setUp()
 
         # create toplevel testdir structure with desired ACL(s)
         #
@@ -62,7 +62,7 @@ class InheritanceSmbCaclsTests(SmbCaclsBlockboxTestBase):
         if self.share != "tmp":
             self.dirpath = os.path.join(os.environ["LOCAL_PATH"],self.share)
             self.dirpath = os.path.join(self.dirpath,self.testdir)
-        super(InheritanceSmbCaclsTests, self).tearDown()
+        super().tearDown()
 
     def test_simple_oi_add(self):
         """test smbcacls '--propagate-inheritance --add' which attempts to add the ACL
index 896e337b711640fe251bb3cf8e87e0abb7a1a539..b3995310f7c5d3e5c845984938f4f6b25141c172 100644 (file)
@@ -22,7 +22,7 @@ import os
 class SaveRestoreSmbCaclsTests(SmbCaclsBlockboxTestBase):
 
     def setUp(self):
-        super(SaveRestoreSmbCaclsTests, self).setUp()
+        super().setUp()
 
         # create toplevel testdir structure with desired ACL(s)
         #
@@ -62,7 +62,7 @@ class SaveRestoreSmbCaclsTests(SmbCaclsBlockboxTestBase):
         if self.share != "tmp":
             self.dirpath = os.path.join(os.environ["LOCAL_PATH"],self.share)
             self.dirpath = os.path.join(self.dirpath,self.testdir)
-        super(SaveRestoreSmbCaclsTests, self).tearDown()
+        super().tearDown()
 
     def test_simple_save_dir(self):
         try:
index cfd9d4d77e2571b83f9df52df82c8f87410b2883..95e21230dd987c3ed0efcf24ca85b836f4579e76 100644 (file)
@@ -26,7 +26,7 @@ USAGE   = "pool-usage"
 class SmbcontrolBlackboxTests(BlackboxTestCase):
 
     def setUp(self):
-        super(SmbcontrolBlackboxTests, self).setUp()
+        super().setUp()
         lp_ctx = self.get_loadparm()
         self.msg_ctx = Messaging(lp_ctx=lp_ctx)
 
index bff2e06adba8e136f54c5771352c28f60da04d16..1ff7720b07961c07700e3303a81dc1aee6eff28d 100644 (file)
@@ -30,7 +30,7 @@ PING = "ping"
 class SmbcontrolProcessBlockboxTests(BlackboxTestCase):
 
     def setUp(self):
-        super(SmbcontrolProcessBlockboxTests, self).setUp()
+        super().setUp()
         lp_ctx = self.get_loadparm()
         self.msg_ctx = Messaging(lp_ctx=lp_ctx)
 
index d2927194902ac7f8995f5d286c848e89dd6570bd..4cb6330c895514510fa15435f1c86aa91334c796 100644 (file)
@@ -60,7 +60,7 @@ class ComplexExpressionTests(TestCase):
     # records in the tests
     @classmethod
     def setUpClass(cls):
-        super(ComplexExpressionTests, cls).setUpClass()
+        super().setUpClass()
         cls.samdb = samba.samdb.SamDB(host, lp=lp,
                                       session_info=system_session(),
                                       credentials=creds)
index 02019b5022af4918ae8255fde85569921a98b06d..5bc7a831da778441bbf1d2929c54a61ad5a0812b 100644 (file)
@@ -73,7 +73,7 @@ class CredentialsOptionsTests(samba.tests.TestCase):
 class AuthenticationFileTests(samba.tests.TestCaseInTempDir):
 
     def setUp(self):
-        super(AuthenticationFileTests, self).setUp()
+        super().setUp()
 
         self.parser = optparse.OptionParser()
         self.credopts = CredentialsOptions(self.parser)
@@ -94,7 +94,7 @@ class AuthenticationFileTests(samba.tests.TestCaseInTempDir):
         auth_file_fd.close()
 
     def tearDown(self):
-        super(AuthenticationFileTests, self).tearDown()
+        super().tearDown()
 
         os.unlink(self.auth_file_name)
 
index bcd15b1130f943dc37d93db80f5a0b4a4950be69..f9781f8ba036196d30b30ef87901feae648b8ca9 100644 (file)
@@ -31,7 +31,7 @@ from samba.dcerpc import misc
 class CredentialsTests(samba.tests.TestCaseInTempDir):
 
     def setUp(self):
-        super(CredentialsTests, self).setUp()
+        super().setUp()
         self.creds = credentials.Credentials()
 
     def test_set_username(self):
index 6f31546c4db99afeca494ca07e1a608f6b42e7ca..073d2c26fa8d4381287acfeb931c5cec4bba5c44 100644 (file)
@@ -27,12 +27,12 @@ import gc
 class ArrayTests(samba.tests.TestCase):
 
     def setUp(self):
-        super(ArrayTests, self).setUp()
+        super().setUp()
         talloc.enable_null_tracking()
         self.startup_blocks = talloc.total_blocks()
 
     def tearDown(self):
-        super(ArrayTests, self).tearDown()
+        super().tearDown()
         gc.collect()
         if talloc.total_blocks() != self.startup_blocks:
             talloc.report_full()
index 6e7c6389becb751d4901a3eb1fe3c8c65ad7c510..13c9af818206b8b3fe741fa26878da922a447154 100644 (file)
@@ -116,7 +116,7 @@ class DnsserverTests(RpcInterfaceTestCase):
         }
 
     def setUp(self):
-        super(DnsserverTests, self).setUp()
+        super().setUp()
         self.server = os.environ["DC_SERVER"]
         self.zone = env_get_var_value("REALM").lower()
         self.conn = dnsserver.dnsserver("ncacn_ip_tcp:%s[sign]" % (self.server),
@@ -155,7 +155,7 @@ class DnsserverTests(RpcInterfaceTestCase):
                                    'DeleteZoneFromDs',
                                    dnsserver.DNSSRV_TYPEID_NULL,
                                    None)
-        super(DnsserverTests, self).tearDown()
+        super().tearDown()
 
     def test_enum_is_sorted(self):
         """
index 7d09a5559366fc13a336176f96b1c42fdc7072a8..31c3ba9ae521162e53de6c6b0a26cc286bb64d80 100644 (file)
@@ -73,7 +73,7 @@ class MdssvcHTTPRequestHandler(BaseHTTPRequestHandler):
 class MdssvcTests(RpcInterfaceTestCase):
 
     def setUp(self):
-        super(MdssvcTests, self).setUp()
+        super().setUp()
 
         self.pipe = mdssvc.mdssvc('ncacn_np:fileserver[/pipe/mdssvc]', self.get_loadparm())
 
index 3c9d0b136a5443206187719e8a5337ee5f5623b3..fa5a042b851558f199f7426c24fff54632347508 100755 (executable)
@@ -44,7 +44,7 @@ global_hexdump = False
 class TestDCERPC_BIND(RawDCERPCTest):
 
     def setUp(self):
-        super(TestDCERPC_BIND, self).setUp()
+        super().setUp()
         self.do_ndr_print = global_ndr_print
         self.do_hexdump = global_hexdump
 
index 61aa044fd5bbd29b5c8413a5da3b0a88e718cc1c..81ca9b1c6cef3cc6d6f20ef0c982b55811a91216 100644 (file)
@@ -146,7 +146,7 @@ class RawDCERPCTest(TestCase):
         return
 
     def setUp(self):
-        super(RawDCERPCTest, self).setUp()
+        super().setUp()
         self.do_ndr_print = False
         self.do_hexdump = False
 
index 04838ff6f1bca670b4ece68fdcba19422ddafda0..be9e4842622556eee1e0446a8da62e7d57021793 100644 (file)
@@ -24,7 +24,7 @@ from samba.tests import RpcInterfaceTestCase
 class WinregTests(RpcInterfaceTestCase):
 
     def setUp(self):
-        super(WinregTests, self).setUp()
+        super().setUp()
         self.conn = winreg.winreg("ncalrpc:", self.get_loadparm(),
                                   self.get_credentials())
 
index 0ae86c5635091c9e22bddb5ae419122542abf72e..949e4e230b6f6c52f92e893d142962711485946d 100644 (file)
@@ -25,7 +25,7 @@ from samba.tests import RpcInterfaceTestCase, TestCase
 class RpcEchoTests(RpcInterfaceTestCase):
 
     def setUp(self):
-        super(RpcEchoTests, self).setUp()
+        super().setUp()
         self.conn = echo.rpcecho("ncalrpc:", self.get_loadparm())
 
     def test_two_contexts(self):
index 32b9faec881be09d58261ec1469e9fed37421959..9029cce127b67dfab81ba3899834e9de37354b90 100644 (file)
@@ -63,7 +63,7 @@ def calc_max_size(num_entries):
 class SamrTests(RpcInterfaceTestCase):
 
     def setUp(self):
-        super(SamrTests, self).setUp()
+        super().setUp()
         self.conn = samr.samr("ncalrpc:", self.get_loadparm())
         self.open_samdb()
         self.open_domain_handle()
index 89cf8ca403e0e334691c9065577d9960cde7c83b..f872bba128cd8c47107d1f7cd3a8627b983fcdcf 100644 (file)
@@ -32,7 +32,7 @@ from samba.tests import RpcInterfaceTestCase
 
 class SamrPasswordTests(RpcInterfaceTestCase):
     def setUp(self):
-        super(SamrPasswordTests, self).setUp()
+        super().setUp()
         self.open_samdb()
 
         self.create_user_account(10000)
@@ -49,7 +49,7 @@ class SamrPasswordTests(RpcInterfaceTestCase):
         self.remote_creds.set_password(self.remote_password)
 
     def tearDown(self):
-        super(SamrPasswordTests, self).tearDown()
+        super().tearDown()
 
         samr.Close(self.user_handle)
         samr.Close(self.domain_handle)
index ddd9661f3432207dddfcdb642ea0366955ef5340..4baaec346ef9ac97832c6560028f9fd69a0c9cb3 100644 (file)
@@ -27,7 +27,7 @@ from samba.tests import RpcInterfaceTestCase
 class SrvsvcTests(RpcInterfaceTestCase):
 
     def setUp(self):
-        super(SrvsvcTests, self).setUp()
+        super().setUp()
         self.conn = srvsvc.srvsvc("ncalrpc:", self.get_loadparm())
         self.server_unc = "\\\\."
 
index 4dbbd3eed5cdfed060e47eea05e8016c2af255dd..a3426bb61a8b33ffeb70ddd72ad6e51c9e9abed7 100644 (file)
@@ -32,12 +32,12 @@ class TestException(Exception):
 class StringTests(samba.tests.TestCase):
 
     def setUp(self):
-        super(StringTests, self).setUp()
+        super().setUp()
         talloc.enable_null_tracking()
         self.startup_blocks = talloc.total_blocks()
 
     def tearDown(self):
-        super(StringTests, self).tearDown()
+        super().tearDown()
         gc.collect()
         if talloc.total_blocks() != self.startup_blocks:
             talloc.report_full()
index d26107393f2b868866ef356c95a5748a3b132015..b7fa1f3c4fbd28f557f40d8d8f4db0b4485d9381 100644 (file)
@@ -24,7 +24,7 @@ from samba.tests import RpcInterfaceTestCase
 class UnixinfoTests(RpcInterfaceTestCase):
 
     def setUp(self):
-        super(UnixinfoTests, self).setUp()
+        super().setUp()
         self.conn = unixinfo.unixinfo("ncalrpc:", self.get_loadparm())
 
     def test_getpwuid_int(self):
index 5d975f53500ada3a4d4e9985e0837f043581b380..28ab18614d3f5cc52e289bf42c9aa723b135cf86 100644 (file)
@@ -38,7 +38,7 @@ def open_bytes(filename):
 
 class DCKeytabTests(tests.TestCase):
     def setUp(self):
-        super(DCKeytabTests, self).setUp()
+        super().setUp()
         self.lp = LoadParm()
         self.lp.load_default()
         self.creds = self.insta_creds(template=self.get_credentials())
@@ -46,7 +46,7 @@ class DCKeytabTests(tests.TestCase):
         self.principal = self.creds.get_principal()
 
     def tearDown(self):
-        super(DCKeytabTests, self).tearDown()
+        super().tearDown()
         os.remove(self.ktfile)
 
     def test_export_keytab(self):
index 8888790378d3de87ac782e33d9dda5b535392bc6..a331e26209d496110ae21b325077db7427c16e9c 100644 (file)
@@ -70,7 +70,7 @@ creds.set_krb_forwardable(credentials.NO_KRB_FORWARDABLE)
 
 class TestSimpleQueries(DNSTest):
     def setUp(self):
-        super(TestSimpleQueries, self).setUp()
+        super().setUp()
         global server, server_ip, lp, creds, timeout
         self.server = server_name
         self.server_ip = server_ip
@@ -302,7 +302,7 @@ class TestSimpleQueries(DNSTest):
 
 class TestDNSUpdates(DNSTest):
     def setUp(self):
-        super(TestDNSUpdates, self).setUp()
+        super().setUp()
         global server, server_ip, lp, creds, timeout
         self.server = server_name
         self.server_ip = server_ip
@@ -718,7 +718,7 @@ class TestComplexQueries(DNSTest):
         self.assert_dns_rcode_equals(response, dns.DNS_RCODE_OK)
 
     def setUp(self):
-        super(TestComplexQueries, self).setUp()
+        super().setUp()
 
         global server, server_ip, lp, creds, timeout
         self.server = server_name
@@ -990,7 +990,7 @@ class TestComplexQueries(DNSTest):
 
 class TestInvalidQueries(DNSTest):
     def setUp(self):
-        super(TestInvalidQueries, self).setUp()
+        super().setUp()
         global server, server_ip, lp, creds, timeout
         self.server = server_name
         self.server_ip = server_ip
@@ -1067,7 +1067,7 @@ class TestInvalidQueries(DNSTest):
 
 class TestZones(DNSTest):
     def setUp(self):
-        super(TestZones, self).setUp()
+        super().setUp()
         global server, server_ip, lp, creds, timeout
         self.server = server_name
         self.server_ip = server_ip
@@ -1089,7 +1089,7 @@ class TestZones(DNSTest):
                        str(self.samdb.get_default_basedn())
 
     def tearDown(self):
-        super(TestZones, self).tearDown()
+        super().tearDown()
 
         try:
             self.delete_zone(self.zone)
@@ -1761,7 +1761,7 @@ class TestZones(DNSTest):
 
 class TestRPCRoundtrip(DNSTest):
     def setUp(self):
-        super(TestRPCRoundtrip, self).setUp()
+        super().setUp()
         global server, server_ip, lp, creds
         self.server = server_name
         self.server_ip = server_ip
index ab00e631772c99b0899f141a8c34865afc104155..d320a0e918391a7a0ddbf3b715230e649f75703b 100644 (file)
@@ -31,7 +31,7 @@ import time
 class DNSTest(TestCaseInTempDir):
 
     def setUp(self):
-        super(DNSTest, self).setUp()
+        super().setUp()
         self.timeout = None
 
     def errstr(self, errcode):
@@ -207,7 +207,7 @@ class DNSTest(TestCaseInTempDir):
 
 class DNSTKeyTest(DNSTest):
     def setUp(self):
-        super(DNSTKeyTest, self).setUp()
+        super().setUp()
         self.settings = {}
         self.settings["lp_ctx"] = self.lp_ctx = tests.env_loadparm()
         self.settings["target_hostname"] = self.server
index cd27790c0af30e6617993915a57078dcc22ee9f6..86b553e53e412fc9dc012b560b770225e881752b 100644 (file)
@@ -157,11 +157,11 @@ def contact_real_server(host, port):
 
 class TestDnsForwarding(DNSTest):
     def __init__(self, *args, **kwargs):
-        super(TestDnsForwarding, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.subprocesses = []
 
     def setUp(self):
-        super(TestDnsForwarding, self).setUp()
+        super().setUp()
         self.server = server_name
         self.server_ip = server_ip
         self.lp = lp
@@ -194,7 +194,7 @@ class TestDnsForwarding(DNSTest):
             return s
 
     def tearDown(self):
-        super(TestDnsForwarding, self).tearDown()
+        super().tearDown()
         for p in self.subprocesses:
             p.kill()
 
index c4c82dc5121ec64f2c3536b68f6c743d19bef72f..d947d2c115e0211578960e2df4cd6a9e1379dabd 100644 (file)
@@ -92,7 +92,7 @@ class TestUDPServer(SocketServer.UDPServer):
             self.address_family = socket.AF_INET6
         else:
             self.address_family = socket.AF_INET
-        super(SocketServer.UDPServer, self).__init__(server_address, RequestHandlerClass)
+        super().__init__(server_address, RequestHandlerClass)
 
 def main():
     global SERVER_ID
index 0234798091d3a9ddc7c1e7137c9e6b9a1eb14a01..7415cef969b98806ad9c997ca507cef12ecddd28 100644 (file)
@@ -55,7 +55,7 @@ creds.set_krb_forwardable(credentials.NO_KRB_FORWARDABLE)
 
 class TestBrokenQueries(DNSTest):
     def setUp(self):
-        super(TestBrokenQueries, self).setUp()
+        super().setUp()
         global server, server_ip, lp, creds, timeout
         self.server_ip = server_ip
         self.lp = lp
index 42f73ba29214962dcaef7761da61eb60d25adf8b..69af14d6f1055c59e3dc123a39911c2c837983eb 100644 (file)
@@ -53,7 +53,7 @@ class TestDNSUpdates(DNSTKeyTest):
     def setUp(self):
         self.server = server_name
         self.server_ip = server_ip
-        super(TestDNSUpdates, self).setUp()
+        super().setUp()
 
     def test_tkey(self):
         "test DNS TKEY handshake"
index b8b544eb26e09ff4a147e1c04c877b252c64281c..d65a53729e3cb7d2d4df51b5f6971a26e6cf2273 100644 (file)
@@ -76,7 +76,7 @@ LEVEL2_EXACT       = "exact.level2.wildcardtest"
 class TestWildCardQueries(DNSTest):
 
     def setUp(self):
-        super(TestWildCardQueries, self).setUp()
+        super().setUp()
         global server, server_ip, lp, creds, timeout
         self.server = server_name
         self.server_ip = server_ip
index f143f923d648f0bb7c91587d009b3a3134854107..df20b04bc7e9370a95543708ef03c2715070c284 100644 (file)
@@ -220,7 +220,7 @@ class SmbDotConfTests(TestCase):
     ])
 
     def setUp(self):
-        super(SmbDotConfTests, self).setUp()
+        super().setUp()
         # create a minimal smb.conf file for testparm
         self.smbconf = os.path.join(self.tempdir, "paramtestsmb.conf")
         f = open(self.smbconf, 'w')
@@ -257,7 +257,7 @@ class SmbDotConfTests(TestCase):
             self.fail("Unable to load parameters")
 
     def tearDown(self):
-        super(SmbDotConfTests, self).tearDown()
+        super().tearDown()
         os.unlink(self.smbconf)
         os.unlink(self.blankconf)
 
index 433905e5a57c997d13b7417e50d57071b3b48aca..12b997281615f7797b4a2751e42850f1f4e9dabc 100644 (file)
@@ -48,7 +48,7 @@ def get_prim_dom(secrets_path, lp):
 class DomainBackupBase(BlackboxTestCase):
 
     def setUp(self):
-        super(DomainBackupBase, self).setUp()
+        super().setUp()
 
         server = os.environ["DC_SERVER"]
         self.user_auth = "-U%s%%%s" % (os.environ["DC_USERNAME"],
@@ -432,7 +432,7 @@ class DomainBackupBase(BlackboxTestCase):
 class DomainBackupOnline(DomainBackupBase):
 
     def setUp(self):
-        super(DomainBackupOnline, self).setUp()
+        super().setUp()
         self.base_cmd = ["domain", "backup", "online",
                          "--server=" + self.server, self.user_auth]
 
@@ -461,7 +461,7 @@ class DomainBackupRename(DomainBackupBase):
 
     # run the above test cases using a rename backup
     def setUp(self):
-        super(DomainBackupRename, self).setUp()
+        super().setUp()
         self.new_server = "RENAMESERV"
         self.restore_domain = "NEWDOMAIN"
         self.restore_realm = "rename.test.net"
@@ -563,7 +563,7 @@ class DomainBackupRename(DomainBackupBase):
     # extra checks we run on the restored DB in the rename case
     def check_restored_database(self, lp, expect_secrets=True):
         # run the common checks over the restored DB
-        common_test = super(DomainBackupRename, self)
+        common_test = super()
         samdb = common_test.check_restored_database(lp, expect_secrets)
 
         # check we have actually renamed the DNs
@@ -608,7 +608,7 @@ class DomainBackupRename(DomainBackupBase):
 class DomainBackupOffline(DomainBackupBase):
 
     def setUp(self):
-        super(DomainBackupOffline, self).setUp()
+        super().setUp()
         self.base_cmd = ["domain", "backup", "offline"]
 
     def test_backup_untar(self):
index 37c36d6ab0216cbf69ac0b531258edef5749b552..4d5b620401d5e75a795b29d0dc11f61a54408686 100644 (file)
@@ -1167,7 +1167,7 @@ class DsdbRemoteNCRootTests(DsdbNCRootTests):
 class DsdbFullScanTests(TestCase):
 
     def setUp(self):
-        super(DsdbFullScanTests, self).setUp()
+        super().setUp()
         self.lp = samba.tests.env_loadparm()
         self.creds = Credentials()
         self.creds.guess(self.lp)
index 37b44c6d3adeb67932efb360d952ac55a8fbaa66..7d5c7f926e1561ecf957d4f331566553ef3a8293 100644 (file)
@@ -34,7 +34,7 @@ from ldb import SCOPE_BASE, LdbError
 class SchemaAttributesTestCase(samba.tests.TestCase):
 
     def setUp(self):
-        super(SchemaAttributesTestCase, self).setUp()
+        super().setUp()
 
         self.lp = samba.tests.env_loadparm()
         self.samdb = samba.tests.connect_samdb(self.lp.samdb_url())
index 6533c679ea4e28c2f6d4493105e6fe32bca4ff8d..73ecd245217f8fb63c591a23e4b0d3741d2039d0 100644 (file)
@@ -34,7 +34,7 @@ from samba import sd_utils
 
 class TrafficEmulatorPacketTests(samba.tests.TestCase):
     def setUp(self):
-        super(TrafficEmulatorPacketTests, self).setUp()
+        super().setUp()
         self.server      = os.environ["SERVER"]
         self.domain      = os.environ["DOMAIN"]
         self.host        = os.environ["SERVER_IP"]
@@ -89,7 +89,7 @@ class TrafficEmulatorPacketTests(samba.tests.TestCase):
         sdutils.dacl_add_ace(self.context.user_dn, mod)
 
     def tearDown(self):
-        super(TrafficEmulatorPacketTests, self).tearDown()
+        super().tearDown()
         traffic.clean_up_accounts(self.ldb, 1)
         del self.ldb
         shutil.rmtree(self.tempdir)
index 96da7048a773dc456fa6b4d58fc46fbcea5308de..e251a3cd71b1d9a1a4ccda9ddbd883a0e9bd90ac 100644 (file)
@@ -37,7 +37,7 @@ from samba.dcerpc import drsblobs
 class EncryptedSecretsTests(TestCase):
 
     def setUp(self):
-        super(EncryptedSecretsTests, self).setUp()
+        super().setUp()
         self.lp = samba.tests.env_loadparm()
         self.creds = Credentials()
         self.session = system_session()
index fbe5995e70b6ff5d896f6947e4621ff22ab1a234..8f9c88d170c818c1b2c8ac7e450cdfa0b552d2eb 100644 (file)
@@ -29,7 +29,7 @@ import samba.tests
 class GensecTests(samba.tests.TestCase):
 
     def setUp(self):
-        super(GensecTests, self).setUp()
+        super().setUp()
         self.settings = {}
         self.settings["lp_ctx"] = self.lp_ctx = samba.tests.env_loadparm()
         self.settings["target_hostname"] = self.lp_ctx.get("netbios name")
index 86ffdf26a288221b0be966ca45bfba2ece7348dc..81bf3b8c03b90c8f28d7d98f0e3bdf5e3d4e9106 100644 (file)
@@ -5091,7 +5091,7 @@ def unstage_file(path):
 
 class GPOTests(tests.TestCase):
     def setUp(self):
-        super(GPOTests, self).setUp()
+        super().setUp()
         self.server = os.environ["SERVER"]
         self.dc_account = self.server.upper() + '$'
         self.lp = s3param.get_context()
index 047471f0e2841db6ea4c467c02c6644cbb8b3a79..dda0c3bb438e090e22ece844962a205a02c45919 100644 (file)
@@ -22,7 +22,7 @@ from samba.gp.gp_sec_ext import gp_access_ext
 
 class GPOTests(tests.TestCase):
     def setUp(self):
-        super(GPOTests, self).setUp()
+        super().setUp()
         self.server = os.environ["SERVER"]
         self.dc_account = self.server.upper() + '$'
         self.lp = LoadParm()
index be1bf58e3c0fe84065ef05cfbc407f15a7fffd60..4edd6824f9fc731703a22cf5a5fdbf82b1df6713 100644 (file)
@@ -101,7 +101,7 @@ class DotFileTests(samba.tests.TestCaseInTempDir):
 class DistanceTests(samba.tests.TestCase):
 
     def setUp(self):
-        super(DistanceTests, self).setUp()
+        super().setUp()
         # a sorted list of colour set names.
         self.sorted_colour_sets = sorted(
             graph.COLOUR_SETS,
index 12efef2c046cbd16a814db20b245ac835c8ff1e1..4c83ae812056afa94f1605541252739575f6d94a 100644 (file)
@@ -46,7 +46,7 @@ class GroupAuditTests(AuditLogTestBase):
     def setUp(self):
         self.message_type = MSG_GROUP_LOG
         self.event_type = DSDB_GROUP_EVENT_NAME
-        super(GroupAuditTests, self).setUp()
+        super().setUp()
 
         self.server_ip = os.environ["SERVER_IP"]
 
@@ -91,7 +91,7 @@ class GroupAuditTests(AuditLogTestBase):
         self.ldb.newgroup(GROUP_NAME_02)
 
     def tearDown(self):
-        super(GroupAuditTests, self).tearDown()
+        super().tearDown()
         delete_force(self.ldb, "cn=" + USER_NAME + ",cn=users," + self.base_dn)
         self.ldb.deletegroup(GROUP_NAME_01)
         self.ldb.deletegroup(GROUP_NAME_02)
index da34171da280d01f13a67e715e08675be648ebe8..b47bc70e1fda3573c265cf214acdb45fe9252b5d 100644 (file)
@@ -39,7 +39,7 @@ class JoinTestCase(DNSTKeyTest):
     def setUp(self):
         self.server = samba.tests.env_get_var_value("SERVER")
         self.server_ip = samba.tests.env_get_var_value("SERVER_IP")
-        super(JoinTestCase, self).setUp()
+        super().setUp()
         self.lp = samba.tests.env_loadparm()
         self.creds = self.get_credentials()
         self.netbios_name = "jointest1"
@@ -79,7 +79,7 @@ class JoinTestCase(DNSTKeyTest):
 
         self.join_ctx.cleanup_old_join(force=True)
 
-        super(JoinTestCase, self).tearDown()
+        super().tearDown()
 
     def test_join_makes_records(self):
         "create a query packet containing one query record via TCP"
index 3ca20845c5853241269645ecdc5e3ea90de65963..31354f0f12b4e97596c0fbd923431f177d48104d 100644 (file)
@@ -51,7 +51,7 @@ ENV_DSAS = {
 
 class KCCTests(samba.tests.TestCase):
     def setUp(self):
-        super(KCCTests, self).setUp()
+        super().setUp()
         self.lp = LoadParm()
         self.creds = Credentials()
         self.creds.guess(self.lp)
index 3cbcb1b9df392d1f59eca0383d08e042fea96f7c..3eaa1c706dac22619ff44375bfae6a833f20de48 100644 (file)
@@ -55,7 +55,7 @@ def make_tree(vertices):
 class UndirectedGraphTests(samba.tests.TestCase):
 
     def setUp(self):
-        super(UndirectedGraphTests, self).setUp()
+        super().setUp()
         vertices = tuple('abcdefgh')
         vertices2 = tuple('ijk')
         edges = tuple(itertools.combinations(vertices, 2))
index 5534de32f64a1245365df7ac7132cfaa83be4bf5..9e573bf942ddc9c621c2ddb78d9337a143d9e428 100644 (file)
@@ -71,7 +71,7 @@ MULTISITE_LDIF_DSAS = (
 
 class LdifImportExportTests(samba.tests.TestCaseInTempDir):
     def setUp(self):
-        super(LdifImportExportTests, self).setUp()
+        super().setUp()
         self.lp = LoadParm()
         self.creds = Credentials()
         self.creds.guess(self.lp)
@@ -156,7 +156,7 @@ class LdifImportExportTests(samba.tests.TestCaseInTempDir):
 
 class KCCMultisiteLdifTests(samba.tests.TestCaseInTempDir):
     def setUp(self):
-        super(KCCMultisiteLdifTests, self).setUp()
+        super().setUp()
         self.lp = LoadParm()
         self.creds = Credentials()
         self.creds.guess(self.lp)
index 12634012d8b3dc7cd4a795a5ca8d2ca9372f641e..4d0940caa46d8f684605e62610093aaa26fc06d8 100755 (executable)
@@ -174,7 +174,7 @@ class AsReqKerberosTests(AsReqBaseTest):
                 cls.generate_dynamic_test("test_as_req_no_preauth", tname, *targs)
 
     def setUp(self):
-        super(AsReqKerberosTests, self).setUp()
+        super().setUp()
         self.do_asn1_print = global_asn1_print
         self.do_hexdump = global_hexdump
 
index bd1b0069917aedcb8a0ee18af675eed8cb0b5fe9..b4be6f8e1d57c891bc732f2e9fe2e03672c306bb 100755 (executable)
@@ -50,7 +50,7 @@ class KdcTests(RawKerberosTest):
     """
 
     def setUp(self):
-        super(KdcTests, self).setUp()
+        super().setUp()
         self.do_asn1_print = global_asn1_print
         self.do_hexdump = global_hexdump
 
index f77dd582949a9073792dec18776921e66bf64977..409d86dce2512aeaa544e42d96764abda2c74299 100644 (file)
@@ -417,7 +417,7 @@ class KerberosCredentials(Credentials):
         security.KERB_ENCTYPE_AES256_CTS_HMAC_SHA1_96_SK)
 
     def __init__(self):
-        super(KerberosCredentials, self).__init__()
+        super().__init__()
         all_enc_types = 0
         all_enc_types |= security.KERB_ENCTYPE_RC4_HMAC_MD5
         all_enc_types |= security.KERB_ENCTYPE_AES128_CTS_HMAC_SHA1_96
index a0d20db9f6c29009eb55026805e40139d82a239e..b91c41251d77977bc23d1591b5cae4cc22131f4e 100755 (executable)
@@ -68,7 +68,7 @@ class S4UKerberosTests(KDCBaseTest):
     default_attrs = security.SE_GROUP_DEFAULT_FLAGS
 
     def setUp(self):
-        super(S4UKerberosTests, self).setUp()
+        super().setUp()
         self.do_asn1_print = global_asn1_print
         self.do_hexdump = global_hexdump
 
index 3cd3b17bb31fd64c95bce7ab73da539268f6bf83..81587bb13cd5a2b8c879d38bb637433e84382177 100755 (executable)
@@ -37,7 +37,7 @@ global_hexdump = False
 class SimpleKerberosTests(RawKerberosTest):
 
     def setUp(self):
-        super(SimpleKerberosTests, self).setUp()
+        super().setUp()
         self.do_asn1_print = global_asn1_print
         self.do_hexdump = global_hexdump
 
index 73a6b3cf52dc1f183e71cb0a43c50583d6d74fde..70e06f87db32575893ee65b7ed7e7de955c93807 100755 (executable)
@@ -38,7 +38,7 @@ global_hexdump = False
 class XrealmKerberosTests(RawKerberosTest):
 
     def setUp(self):
-        super(XrealmKerberosTests, self).setUp()
+        super().setUp()
         self.do_asn1_print = global_asn1_print
         self.do_hexdump = global_hexdump
 
index 178cc48aa6c14dd8c36291db167be9ee22861cad..192d787decbc378dd1520d6d30c5544ab2e4db0b 100644 (file)
@@ -43,7 +43,7 @@ MACHINE_NAME = "krb5credstest"
 class PyKrb5CredentialsTests(TestCase):
 
     def setUp(self):
-        super(PyKrb5CredentialsTests, self).setUp()
+        super().setUp()
 
         self.server      = os.environ["SERVER"]
         self.domain      = os.environ["DOMAIN"]
@@ -61,7 +61,7 @@ class PyKrb5CredentialsTests(TestCase):
         self.create_machine_account()
 
     def tearDown(self):
-        super(PyKrb5CredentialsTests, self).tearDown()
+        super().tearDown()
         delete_force(self.ldb, self.machine_dn)
 
     def test_get_named_ccache(self):
index 09b61b2dc557049b1bca39b3382898fe183d990b..548039f120c122fc931a5c332137a4b80d639853 100644 (file)
@@ -154,7 +154,7 @@ class RawLdapTest(TestCase):
     """
 
     def setUp(self):
-        super(RawLdapTest, self).setUp()
+        super().setUp()
 
         self.host = samba.tests.env_get_var_value('SERVER')
         self.port = 636
@@ -166,7 +166,7 @@ class RawLdapTest(TestCase):
 
     def tearDown(self):
         self.disconnect()
-        super(RawLdapTest, self).tearDown()
+        super().tearDown()
 
     def disconnect(self):
         """ Disconnect from and clean up the connection to the server """
@@ -751,7 +751,7 @@ class RawCldapTest(TestCase):
     """
 
     def setUp(self):
-        super(RawCldapTest, self).setUp()
+        super().setUp()
 
         self.host = samba.tests.env_get_var_value('SERVER')
         self.port = 389
@@ -760,7 +760,7 @@ class RawCldapTest(TestCase):
 
     def tearDown(self):
         self.disconnect()
-        super(RawCldapTest, self).tearDown()
+        super().tearDown()
 
     def disconnect(self):
         """ Disconnect from and clean up the connection to the server """
index 20f0e57e8743f5e570c0c08417f8e3792072b988..5bc3a1aab3dac5bcdd1732517f702010996f003d 100644 (file)
@@ -31,7 +31,7 @@ import ctypes
 class NetJoinTests(samba.tests.TestCaseInTempDir):
 
     def setUp(self):
-        super(NetJoinTests, self).setUp()
+        super().setUp()
         self.domain = os.environ["DOMAIN"]
         self.server = os.environ["SERVER"]
         self.lp = self.get_loadparm()
index 747f3c55b9942d8b1015083a6ed535b8591044a4..d0da28f1e2ff48496fe1be27d00b246a78a06773 100644 (file)
@@ -31,7 +31,7 @@ import ctypes
 class NetJoinNoSpnegoTests(samba.tests.TestCaseInTempDir):
 
     def setUp(self):
-        super(NetJoinNoSpnegoTests, self).setUp()
+        super().setUp()
         self.domain = os.environ["DOMAIN"]
         self.server = os.environ["SERVER"]
         self.lp = self.get_loadparm()
index 9a0807215a3ee60435254e79bcd5fde7937ef682..0358b0b8ed9af21579da60174089b9875825ac6a 100644 (file)
@@ -22,7 +22,7 @@ from samba import netbios
 
 class NetBiosTests(samba.tests.TestCase):
     def setUp(self):
-        super(NetBiosTests, self).setUp()
+        super().setUp()
         self.n = netbios.Node()
         self.ifc = os.environ["SERVER_IP"]
         self.dc = os.environ["DC_NETBIOSNAME"]
index 70efd6d2b060a62ba37b8b4f052af92617a735dc..a509930103a826b9c1c8db5128bc7c4d1ccc3679 100644 (file)
@@ -31,7 +31,7 @@ Tests whether the netlogon service is running
 class NetlogonServiceTests(TestCase):
 
     def setUp(self):
-        super(NetlogonServiceTests, self).setUp()
+        super().setUp()
 
         self.server      = os.environ["SERVER"]
         self.lp          = self.get_loadparm()
index 4d625768d9179a26a79854272844242b9059091f..0b7963d902e7f312f48518f47ad8a67c19e3c0f9 100644 (file)
@@ -33,14 +33,14 @@ DOMAIN_SID = "S-1-5-21-2212615479-2695158682-2101375467"
 class NtaclsTests(TestCaseInTempDir):
 
     def setUp(self):
-        super(NtaclsTests, self).setUp()
+        super().setUp()
         self.tempf = os.path.join(self.tempdir, "test")
         open(self.tempf, 'w').write("empty")
         self.session_info = system_session_unix()
 
     def tearDown(self):
         os.unlink(self.tempf)
-        super(NtaclsTests, self).tearDown()
+        super().tearDown()
 
     def test_setntacl(self):
         lp = LoadParm()
index 03a9c0b22d870d1187a84255257f2a50608f0f6b..d4e42940d4f7e30966f0c76e22c3a9da6bc09afb 100644 (file)
@@ -37,7 +37,7 @@ class NtaclsBackupRestoreTests(SmbdBaseTests):
     """
 
     def setUp(self):
-        super(NtaclsBackupRestoreTests, self).setUp()
+        super().setUp()
 
         self.server = os.environ["SERVER"]  # addc
         samdb_url = 'ldap://' + self.server
@@ -90,7 +90,7 @@ class NtaclsBackupRestoreTests(SmbdBaseTests):
     def tearDown(self):
         self._delete_tarfile()
         self.smb_helper.delete_tree()
-        super(NtaclsBackupRestoreTests, self).tearDown()
+        super().tearDown()
 
     def _delete_tarfile(self):
         try:
index 8a43d6e120951e0915b1d5684a973c2f234320e7..fc5fa206f5cd00c749cc822d68f38a1b5c5f9224 100644 (file)
@@ -25,7 +25,7 @@ from samba.common import get_string
 class NTLMAuthHelpersTests(NTLMAuthTestCase):
 
     def setUp(self):
-        super(NTLMAuthHelpersTests, self).setUp()
+        super().setUp()
         self.username = os.environ["DC_USERNAME"]
         self.password = os.environ["DC_PASSWORD"]
         self.domain = os.environ["DOMAIN"]
index 546c89762cc61a33b6d07badf5f047b77b7d08a7..993ac12ca03b941dc4523a0f60c815c1ea49a731 100644 (file)
@@ -29,7 +29,7 @@ from samba.tests import BlackboxTestCase
 class NTLMAuthTestCase(BlackboxTestCase):
 
     def setUp(self):
-        super(NTLMAuthTestCase, self).setUp()
+        super().setUp()
         bindir = os.path.normpath(os.getenv("BINDIR", "./bin"))
         self.ntlm_auth_path = os.path.join(bindir, 'ntlm_auth')
         self.lp = samba.tests.env_loadparm()
index d1957d68a0b7e06a754ab09dea6ceb4a6fa4d45b..db57400dda5113007007fa85109cf868495883ce 100644 (file)
@@ -24,7 +24,7 @@ from samba.tests.ntlm_auth_base import NTLMAuthTestCase
 class NTLMAuthKerberosTests(NTLMAuthTestCase):
 
     def setUp(self):
-        super(NTLMAuthKerberosTests, self).setUp()
+        super().setUp()
         self.old_ccache = os.path.join(os.environ["SELFTEST_PREFIX"],
                                        "ktest", "krb5_ccache-2")
         self.ccache = os.path.join(os.environ["SELFTEST_PREFIX"],
index 0365694cab00d57c565b0f41478ad8b1fca5c11c..405f47db620fffa141e7368ecf1ccfcbc683ae3a 100644 (file)
@@ -34,7 +34,7 @@ Tests behaviour when NTLM is disabled
 class NtlmDisabledTests(TestCase):
 
     def setUp(self):
-        super(NtlmDisabledTests, self).setUp()
+        super().setUp()
 
         self.lp          = self.get_loadparm()
         self.server      = os.getenv("SERVER")
index f201ef9e213bfff262569c6ef72498298651be10..7c45d91c1e6a36e9f567c899bcee0736d27eae98 100644 (file)
@@ -25,13 +25,13 @@ import os
 class LoadParmTestCase(samba.tests.TestCaseInTempDir):
 
     def setUp(self):
-        super(LoadParmTestCase, self).setUp()
+        super().setUp()
         self.tempf = os.path.join(self.tempdir, "test")
         open(self.tempf, 'w').write("empty")
 
     def tearDown(self):
         os.unlink(self.tempf)
-        super(LoadParmTestCase, self).tearDown()
+        super().tearDown()
 
     def test_init(self):
         file = param.LoadParm()
index 35983cfd5cdde9d70813ca65de1e59e74fd2aadb..1b7af7de7b8a942e6387c7bf3915575e8985ceee 100644 (file)
@@ -75,7 +75,7 @@ class PassWordHashTests(TestCase):
 
     def setUp(self):
         self.lp = samba.tests.env_loadparm()
-        super(PassWordHashTests, self).setUp()
+        super().setUp()
 
     def set_store_cleartext(self, cleartext):
         # get the current pwdProperties
index 0ef689d5cf386984a6a6b848124ba13672975f69..a82fa768988d6aaf7b88582a922fab2c0014ea3a 100644 (file)
@@ -37,7 +37,7 @@ ACL = "O:S-1-5-21-2212615479-2695158682-2101375467-512G:S-1-5-21-2212615479-2695
 class PosixAclMappingTests(SmbdBaseTests):
 
     def setUp(self):
-        super(PosixAclMappingTests, self).setUp()
+        super().setUp()
         s3conf = s3param.get_context()
         s3conf.load(self.get_loadparm().configfile)
         s3conf.set("xattr_tdb:file", os.path.join(self.tempdir, "xattr.tdb"))
@@ -49,7 +49,7 @@ class PosixAclMappingTests(SmbdBaseTests):
     def tearDown(self):
         smbd.unlink(self.tempf, self.get_session_info())
         os.unlink(os.path.join(self.tempdir, "xattr.tdb"))
-        super(PosixAclMappingTests, self).tearDown()
+        super().tearDown()
 
     def get_session_info(self, domsid=DOM_SID):
         """
index ef601dd5d7dd1c90278aca1c1ffe5310164817d0..6c11200b39e9585dbb0a6af01879adad9cecd1ae 100644 (file)
@@ -45,7 +45,7 @@ MACHINE_NAME = "PFRS"
 class PreforkProcessRestartTests(TestCase):
 
     def setUp(self):
-        super(PreforkProcessRestartTests, self).setUp()
+        super().setUp()
         lp_ctx = self.get_loadparm()
         self.msg_ctx = Messaging(lp_ctx=lp_ctx)
 
index 0c442b81f3fcd4db5f67b6fc3b090f5d1cfff759..3db72822c93c3d1ddbd1aff5adaf6dcfc8d890f6 100644 (file)
@@ -57,7 +57,7 @@ USER_NAME    = "PCTU"
 class PyCredentialsTests(TestCase):
 
     def setUp(self):
-        super(PyCredentialsTests, self).setUp()
+        super().setUp()
 
         self.server      = os.environ["SERVER"]
         self.domain      = os.environ["DOMAIN"]
@@ -76,7 +76,7 @@ class PyCredentialsTests(TestCase):
         self.create_user_account()
 
     def tearDown(self):
-        super(PyCredentialsTests, self).tearDown()
+        super().tearDown()
         delete_force(self.ldb, self.machine_dn)
         delete_force(self.ldb, self.user_dn)
 
index 51b280a63480424370310b10ba410179e74ab071..8154ae3dd18b3424be01535a9c7cd52079996a4f 100644 (file)
@@ -37,14 +37,14 @@ class HelperTests(samba.tests.TestCase):
 class HiveTests(samba.tests.TestCaseInTempDir):
 
     def setUp(self):
-        super(HiveTests, self).setUp()
+        super().setUp()
         self.hive_path = os.path.join(self.tempdir, "ldb_new.ldb")
         self.hive = registry.open_ldb(self.hive_path)
 
     def tearDown(self):
         del self.hive
         os.unlink(self.hive_path)
-        super(HiveTests, self).tearDown()
+        super().tearDown()
 
     def test_ldb_new(self):
         self.assertTrue(self.hive is not None)
index 2150e4e25b7872331d56cb38dd362a6f72c0d464..101f4b1b66407213460650e6da57d31c7a9f429c 100644 (file)
@@ -39,7 +39,7 @@ def rm(rmdir):
 class NetS3JoinTests(samba.tests.TestCaseInTempDir):
 
     def setUp(self):
-        super(NetS3JoinTests, self).setUp()
+        super().setUp()
         self.realm = os.environ["REALM"]
         self.domain = os.environ["DOMAIN"]
         self.server = os.environ["SERVER"]
index b8d936f056f882bd303ea66b21cd78975a5abf98..ca16786b9f1e08a4d6f3ec9394e2162e7b8fbe9a 100644 (file)
@@ -30,7 +30,7 @@ for p in ["../../../../../testdata/samba3", "../../../../testdata/samba3"]:
 class IdmapDbTestCase(TestCase):
 
     def setUp(self):
-        super(IdmapDbTestCase, self).setUp()
+        super().setUp()
         self.idmapdb = IdmapDatabase(os.path.join(DATADIR,
                                                   "winbindd_idmap"))
 
@@ -54,4 +54,4 @@ class IdmapDbTestCase(TestCase):
 
     def tearDown(self):
         self.idmapdb.close()
-        super(IdmapDbTestCase, self).tearDown()
+        super().tearDown()
index 232e79bbd5ff05c2fb39919c786f894a45ca9229..263ea212263d09c313dabe2dd69c68c498bbe3c2 100644 (file)
@@ -31,7 +31,7 @@ for p in ["../../../../../testdata/samba3", "../../../../testdata/samba3"]:
 class ParamTestCase(TestCaseInTempDir):
 
     def setUp(self):
-        super(ParamTestCase, self).setUp()
+        super().setUp()
         os.system("cp -r %s %s" % (DATADIR, self.tempdir))
         datadir = os.path.join(self.tempdir, "samba3")
 
@@ -41,7 +41,7 @@ class ParamTestCase(TestCaseInTempDir):
     def tearDown(self):
         self.lp = []
         os.system("rm -rf %s" % os.path.join(self.tempdir, "samba3"))
-        super(ParamTestCase, self).tearDown()
+        super().tearDown()
 
     def test_param(self):
         self.assertEqual("BEDWYR", self.lp.get("netbios name"))
index 734ca96110a472a9ed0a0f26bbfc32972c1728a1..b584e07fc9801d25b90ff5c2311aa98120dc6efd 100644 (file)
@@ -33,7 +33,7 @@ for p in ["../../../../../testdata/samba3", "../../../../testdata/samba3"]:
 class PassdbTestCase(TestCaseInTempDir):
 
     def setUp(self):
-        super(PassdbTestCase, self).setUp()
+        super().setUp()
         os.system("cp -r %s %s" % (DATADIR, self.tempdir))
         datadir = os.path.join(self.tempdir, "samba3")
 
@@ -50,7 +50,7 @@ class PassdbTestCase(TestCaseInTempDir):
         self.lp = []
         self.pdb = []
         os.system("rm -rf %s" % os.path.join(self.tempdir, "samba3"))
-        super(PassdbTestCase, self).tearDown()
+        super().tearDown()
 
     def test_policy(self):
         policy = self.pdb.get_account_policy()
index 5e9004e4e1d6bd4d01cfc25ef4443ea5efc900e4..1932d064af996c6920bb1f5a0d9d05254ea8f3f2 100644 (file)
@@ -31,12 +31,12 @@ for p in ["../../../../../testdata/samba3", "../../../../testdata/samba3"]:
 class RegistryTestCase(TestCase):
 
     def setUp(self):
-        super(RegistryTestCase, self).setUp()
+        super().setUp()
         self.registry = Registry(os.path.join(DATADIR, "registry"))
 
     def tearDown(self):
         self.registry.close()
-        super(RegistryTestCase, self).tearDown()
+        super().tearDown()
 
     def test_length(self):
         self.assertEqual(28, len(self.registry))
index b92105c46b4de1abda1b8ab998c2b8041816d659..62f429cd126a6e1356b07f4af2e9a59808040fc5 100644 (file)
@@ -31,7 +31,7 @@ for p in ["../../../../../testdata/samba3", "../../../../testdata/samba3"]:
 class WinsDatabaseTestCase(TestCase):
 
     def setUp(self):
-        super(WinsDatabaseTestCase, self).setUp()
+        super().setUp()
         self.winsdb = WinsDatabase(os.path.join(DATADIR, "wins.dat"))
 
     def test_length(self):
@@ -42,4 +42,4 @@ class WinsDatabaseTestCase(TestCase):
 
     def tearDown(self):
         self.winsdb.close()
-        super(WinsDatabaseTestCase, self).tearDown()
+        super().tearDown()
index 01d274da7be0e8873765ce37e316e530d2dc95f9..1f88602364a196ccb86247047a25be48be20605f 100644 (file)
@@ -65,7 +65,7 @@ class MapBaseTestCase(TestCaseInTempDir):
         self.lp = env_loadparm()
         self.lp.set("workgroup", "TESTS")
         self.lp.set("netbios name", "TESTS")
-        super(MapBaseTestCase, self).setUp()
+        super().setUp()
 
         def make_dn(basedn, rdn):
             return "%s,sambaDomainName=TESTS,%s" % (rdn, basedn)
@@ -125,7 +125,7 @@ class MapBaseTestCase(TestCaseInTempDir):
         if os.path.exists(mdata):
             os.unlink(mdata)
             os.rmdir(pdir)
-        super(MapBaseTestCase, self).tearDown()
+        super().tearDown()
 
     def assertSidEquals(self, text, ndr_sid):
         sid_obj1 = samba.ndr.ndr_unpack(samba.dcerpc.security.dom_sid,
@@ -137,7 +137,7 @@ class MapBaseTestCase(TestCaseInTempDir):
 class Samba3SamTestCase(MapBaseTestCase):
 
     def setUp(self):
-        super(Samba3SamTestCase, self).setUp()
+        super().setUp()
         ldb = Ldb(self.ldburl, lp=self.lp, session_info=system_session())
         ldb.set_opaque("skip_allocate_sids", "true")
         self.samba3.setup_data("samba3.ldif")
@@ -306,7 +306,7 @@ delete: description
 class MapTestCase(MapBaseTestCase):
 
     def setUp(self):
-        super(MapTestCase, self).setUp()
+        super().setUp()
         ldb = Ldb(self.ldburl, lp=self.lp, session_info=system_session())
         ldb.set_opaque("skip_allocate_sids", "true")
         ldif = read_datafile("provision_samba3sam.ldif")
index 740aaf0d48a9c4a4c12a4d5cba6072acc77107ab..b60e7561cdd5e4373f571755626a10efeb5198b1 100644 (file)
@@ -33,7 +33,7 @@ class ComputerCmdTestCase(SambaToolCmdTest):
     samdb = None
 
     def setUp(self):
-        super(ComputerCmdTestCase, self).setUp()
+        super().setUp()
         self.creds = "-U%s%%%s" % (os.environ["DC_USERNAME"], os.environ["DC_PASSWORD"])
         self.samdb = self.getSamDB("-H", "ldap://%s" % os.environ["DC_SERVER"], self.creds)
         # ips used to test --ip-address option
@@ -91,7 +91,7 @@ class ComputerCmdTestCase(SambaToolCmdTest):
                               computer["description"])
 
     def tearDown(self):
-        super(ComputerCmdTestCase, self).tearDown()
+        super().tearDown()
         # clean up all the left over computers, just in case
         for computer in self.computers:
             if self._find_computer(computer["name"]):
index 00050120bfc2dca8659e81460fc9f9c2e3b71e7a..2bec8135f87e6f135a314dc156a80f16e1d2fff4 100644 (file)
@@ -28,7 +28,7 @@ class ContactCmdTestCase(SambaToolCmdTest):
     samdb = None
 
     def setUp(self):
-        super(ContactCmdTestCase, self).setUp()
+        super().setUp()
         self.creds = "-U%s%%%s" % (os.environ["DC_USERNAME"],
                                    os.environ["DC_PASSWORD"])
         self.samdb = self.getSamDB("-H",
@@ -83,7 +83,7 @@ class ContactCmdTestCase(SambaToolCmdTest):
                               contact["description"])
 
     def tearDown(self):
-        super(ContactCmdTestCase, self).tearDown()
+        super().tearDown()
         # clean up all the left over contacts, just in case
         for contact in self.contacts:
             if self._find_contact(contact["expectedname"]):
index ce57ad16c41ab8bea2b310bd89987f0ae46c7a03..2c63ccaaf53039a899db58458b276f80869088fd 100644 (file)
@@ -24,7 +24,7 @@ class DemoteCmdTestCase(SambaToolCmdTest):
     """Test for samba-tool domain demote subcommand"""
 
     def setUp(self):
-        super(DemoteCmdTestCase, self).setUp()
+        super().setUp()
         self.creds_string = "-U{0}%{1}".format(
             os.environ["DC_USERNAME"], os.environ["DC_PASSWORD"])
 
index da8ff9a76b6aa095eaa7b896208cd74f989df8f6..d372bc5851e601cba2fca307e0bdd2cee50952fa 100644 (file)
@@ -28,7 +28,7 @@ from samba import dsdb_dns
 
 class DnsCmdTestCase(SambaToolCmdTest):
     def setUp(self):
-        super(DnsCmdTestCase, self).setUp()
+        super().setUp()
 
         self.dburl = "ldap://%s" % os.environ["SERVER"]
         self.creds_string = "-U%s%%%s" % (os.environ["DC_USERNAME"],
index efb9ed9536a9250dd6a764131f4ae0bc877b4eef..1cb88d38a18d8c5040e3cf45e09fdb3ce6060ffe 100644 (file)
@@ -24,7 +24,7 @@ class DrsCloneDcDataLmdbSizeTestCase(SambaToolCmdTest):
     """Test setting of the lmdb map size during drs clone-dc-data"""
 
     def setUp(self):
-        super(DrsCloneDcDataLmdbSizeTestCase, self).setUp()
+        super().setUp()
         self.tempsambadir = os.path.join(self.tempdir, "samba")
         os.mkdir(self.tempsambadir)
 
@@ -115,5 +115,5 @@ class DrsCloneDcDataLmdbSizeTestCase(SambaToolCmdTest):
             " optional unit suffix")
 
     def tearDown(self):
-        super(DrsCloneDcDataLmdbSizeTestCase, self).tearDown()
+        super().tearDown()
         shutil.rmtree(self.tempsambadir)
index 85c08d4932d3385d1cedb72fe02ea0ba913074b1..8ddf37e5c7fd04232ce2bcddf2af3c36e7694843 100644 (file)
@@ -28,13 +28,13 @@ class DSaclSetSddlTestCase(SambaToolCmdTest):
     sddl_multi = "(OA;CIIO;RPWP;aaaaaaaa-1111-bbbb-2222-dddddddddddd;33333333-eeee-4444-ffff-555555555555;PS)(OA;CIIO;RPWP;cccccccc-9999-ffff-8888-eeeeeeeeeeee;77777777-dddd-6666-bbbb-555555555555;PS)"
 
     def setUp(self):
-        super(DSaclSetSddlTestCase, self).setUp()
+        super().setUp()
         self.samdb = self.getSamDB("-H", "ldap://%s" % os.environ["DC_SERVER"],"-U%s%%%s" % (os.environ["DC_USERNAME"], os.environ["DC_PASSWORD"]))
         self.dn="OU=DSaclSetSddlTestCase,%s" % self.samdb.domain_dn()
         self.samdb.create_ou(self.dn)
 
     def tearDown(self):
-        super(DSaclSetSddlTestCase, self).tearDown()
+        super().tearDown()
         # clean-up the created test ou
         self.samdb.delete(self.dn)
 
index 25eeb4ccedb793f15782189f47392f29e640b26a..23291ca83a3f8d9621b113c2ed1b91594d8e957b 100644 (file)
@@ -25,13 +25,13 @@ class ForestCmdTestCase(SambaToolCmdTest):
     samdb = None
 
     def setUp(self):
-        super(ForestCmdTestCase, self).setUp()
+        super().setUp()
         self.samdb = self.getSamDB("-H", "ldap://%s" % os.environ["DC_SERVER"],
                                    "-U%s%%%s" % (os.environ["DC_USERNAME"], os.environ["DC_PASSWORD"]))
         self.domain_dn = self.samdb.domain_dn()
 
     def tearDown(self):
-        super(ForestCmdTestCase, self).tearDown()
+        super().tearDown()
         # Reset the values we might have changed.
         ds_dn = "CN=Directory Service,CN=Windows NT,CN=Services,CN=Configuration"
         m = ldb.Message()
index 39363bc4f754bc5dedff6df2113edb12546ac50d..851c70efecf827478b34f5c41858837006d48491 100644 (file)
@@ -1822,7 +1822,7 @@ class GpoCmdTestCase(SambaToolCmdTest):
 
     def setUp(self):
         """set up a temporary GPO to work with"""
-        super(GpoCmdTestCase, self).setUp()
+        super().setUp()
         (result, out, err) = self.runsubcmd("gpo", "create", self.gpo_name,
                                             "-H", "ldap://%s" % os.environ["SERVER"],
                                             "-U%s%%%s" % (os.environ["USERNAME"], os.environ["PASSWORD"]),
@@ -1844,4 +1844,4 @@ class GpoCmdTestCase(SambaToolCmdTest):
         """remove the temporary GPO to work with"""
         (result, out, err) = self.runsubcmd("gpo", "del", self.gpo_guid, "-H", "ldap://%s" % os.environ["SERVER"], "-U%s%%%s" % (os.environ["USERNAME"], os.environ["PASSWORD"]))
         self.assertCmdSuccess(result, out, err, "Ensuring gpo deleted successfully")
-        super(GpoCmdTestCase, self).tearDown()
+        super().tearDown()
index 8ee14d1bfae2ea3b45014f7fb1e16279cefe0d5e..e7a24b0aa4f6bbe43bf80a405d05b3e7594a0a82 100644 (file)
@@ -171,7 +171,7 @@ class GpoCmdTestCase(SambaToolCmdTest):
 
     def setUp(self):
         """set up a temporary GPO to work with"""
-        super(GpoCmdTestCase, self).setUp()
+        super().setUp()
         (result, out, err) = self.runsubcmd("gpo", "create", self.gpo_name,
                                             "-H", "ldap://%s" % os.environ["SERVER"],
                                             "-U%s%%%s" % (os.environ["USERNAME"], os.environ["PASSWORD"]),
@@ -199,4 +199,4 @@ class GpoCmdTestCase(SambaToolCmdTest):
         self.assertCmdSuccess(result, out, err, 'User delete failed')
         (result, out, err) = self.runsubcmd("group", "delete", self.test_group)
         self.assertCmdSuccess(result, out, err, 'Group delete failed')
-        super(GpoCmdTestCase, self).tearDown()
+        super().tearDown()
index ed95ef6c5b150790ecc71a439ed0aaba99f12910..e7a660c75e1c2527a51aa16b11010ff92d1d456a 100644 (file)
@@ -31,7 +31,7 @@ class GroupCmdTestCase(SambaToolCmdTest):
     samdb = None
 
     def setUp(self):
-        super(GroupCmdTestCase, self).setUp()
+        super().setUp()
         self.samdb = self.getSamDB("-H", "ldap://%s" % os.environ["DC_SERVER"],
                                    "-U%s%%%s" % (os.environ["DC_USERNAME"], os.environ["DC_PASSWORD"]))
         self.groups = []
@@ -74,7 +74,7 @@ class GroupCmdTestCase(SambaToolCmdTest):
             self.assertEqual("%s" % found.get("description"), group["description"])
 
     def tearDown(self):
-        super(GroupCmdTestCase, self).tearDown()
+        super().tearDown()
         # clean up all the left over groups, just in case
         for group in self.groups:
             if self._find_group(group["name"]):
index db166690bd9998f8a212c5340e5331562c7da7d6..7b43c45ce78d9ca794ff12d507fa0a3068282473 100644 (file)
@@ -24,7 +24,7 @@ class JoinLmdbSizeTestCase(SambaToolCmdTest):
     """Test setting of the lmdb map size during join"""
 
     def setUp(self):
-        super(JoinLmdbSizeTestCase, self).setUp()
+        super().setUp()
         self.tempsambadir = os.path.join(self.tempdir, "samba")
         os.mkdir(self.tempsambadir)
         (_, name) = os.path.split(self.tempdir)
@@ -148,5 +148,5 @@ class JoinLmdbSizeTestCase(SambaToolCmdTest):
             " optional unit suffix")
 
     def tearDown(self):
-        super(JoinLmdbSizeTestCase, self).tearDown()
+        super().tearDown()
         shutil.rmtree(self.tempsambadir)
index dd5fc672c2b934b549c1c28df4c06ff0ac03ab75..7a848766e0b865d797d051b38cc9ec2152eb8895 100644 (file)
@@ -30,7 +30,7 @@ class OUCmdTestCase(SambaToolCmdTest):
     samdb = None
 
     def setUp(self):
-        super(OUCmdTestCase, self).setUp()
+        super().setUp()
         self.samdb = self.getSamDB("-H", "ldap://%s" % os.environ["DC_SERVER"],
                                    "-U%s%%%s" % (os.environ["DC_USERNAME"], os.environ["DC_PASSWORD"]))
         self.ous = []
@@ -57,7 +57,7 @@ class OUCmdTestCase(SambaToolCmdTest):
                               ou["description"])
 
     def tearDown(self):
-        super(OUCmdTestCase, self).tearDown()
+        super().tearDown()
         # clean up all the left over ous, just in case
         for ou in self.ous:
             if self._find_ou(ou["name"]):
index e9e995389bd1492cc993e97f8513cfeda0c9e180..6db7a585b82ab756299ed505caf6058bf43f13b8 100644 (file)
@@ -26,7 +26,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest):
     """Tests for 'samba-tool domain passwordsettings' subcommands"""
 
     def setUp(self):
-        super(PwdSettingsCmdTestCase, self).setUp()
+        super().setUp()
         self.server = "ldap://%s" % os.environ["DC_SERVER"]
         self.user_auth = "-U%s%%%s" % (os.environ["DC_USERNAME"],
                                        os.environ["DC_PASSWORD"])
@@ -36,7 +36,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest):
         self.obj_cleanup = []
 
     def tearDown(self):
-        super(PwdSettingsCmdTestCase, self).tearDown()
+        super().tearDown()
         # clean-up any objects the test has created
         for dn in self.obj_cleanup:
             self.ldb.delete(dn)
index fbb0bfdeeffdcf4464b71a41e080ec4a0fb7f5ac..88e9d7cac632d9ee7afb585b8e24fa1a093a20ed 100644 (file)
@@ -24,7 +24,7 @@ class PromoteDcLmdbSizeTestCase(SambaToolCmdTest):
     """Test setting of the lmdb map size during a promote dc"""
 
     def setUp(self):
-        super(PromoteDcLmdbSizeTestCase, self).setUp()
+        super().setUp()
         self.tempsambadir = os.path.join(self.tempdir, "samba")
         os.mkdir(self.tempsambadir)
         (_, name) = os.path.split(self.tempdir)
@@ -170,5 +170,5 @@ class PromoteDcLmdbSizeTestCase(SambaToolCmdTest):
             " optional unit suffix")
 
     def tearDown(self):
-        super(PromoteDcLmdbSizeTestCase, self).tearDown()
+        super().tearDown()
         shutil.rmtree(self.tempsambadir)
index 2435e120e07d5b8013fe6e45387b252f9e11a2f1..3514edf854b376f3c6453f90efbf5b1add4cd5dd 100644 (file)
@@ -24,7 +24,7 @@ class ProvisionLmdbSizeTestCase(SambaToolCmdTest):
     """Test setting of the lmdb map size during provision"""
 
     def setUp(self):
-        super(ProvisionLmdbSizeTestCase, self).setUp()
+        super().setUp()
         self.tempsambadir = os.path.join(self.tempdir, "samba")
         os.mkdir(self.tempsambadir)
 
@@ -128,5 +128,5 @@ class ProvisionLmdbSizeTestCase(SambaToolCmdTest):
             " optional unit suffix")
 
     def tearDown(self):
-        super(ProvisionLmdbSizeTestCase, self).tearDown()
+        super().tearDown()
         shutil.rmtree(self.tempsambadir)
index 83304292568ba29f71cc8a9c6632e46503f21e3d..51b4a4d3cfd20082d7dcf825a62e9f6c014bad29 100644 (file)
@@ -24,7 +24,7 @@ class ProvisionPasswordTestCase(SambaToolCmdTest):
     """Test for password validation in domain provision subcommand"""
 
     def setUp(self):
-        super(ProvisionPasswordTestCase, self).setUp()
+        super().setUp()
         self.tempsambadir = os.path.join(self.tempdir, "samba")
         os.mkdir(self.tempsambadir)
 
@@ -53,5 +53,5 @@ class ProvisionPasswordTestCase(SambaToolCmdTest):
         self.assertCmdSuccess(result, out, err)
 
     def tearDown(self):
-        super(ProvisionPasswordTestCase, self).tearDown()
+        super().tearDown()
         shutil.rmtree(self.tempsambadir)
index 07752e16c301812f10faf10a514fa98edf655b76..2de8cdd2b0efec1b322e4d72d85336fe5039253a 100644 (file)
@@ -27,7 +27,7 @@ class ProvisionUserPasswordTestCase(SambaToolCmdTest):
     """Test for crypt() hashed passwords"""
 
     def setUp(self):
-        super(ProvisionUserPasswordTestCase, self).setUp()
+        super().setUp()
         self.tempsambadir = os.path.join(self.tempdir, "samba")
         os.mkdir(self.tempsambadir)
 
@@ -63,5 +63,5 @@ class ProvisionUserPasswordTestCase(SambaToolCmdTest):
         self.assertNotEqual(0, result)
 
     def tearDown(self):
-        super(ProvisionUserPasswordTestCase, self).tearDown()
+        super().tearDown()
         shutil.rmtree(self.tempsambadir)
index 3a835dc0b02e9dcd824079482d29abcbee2ac1b7..94e84d6a677416be79db39e10940883944db03ec 100644 (file)
@@ -27,7 +27,7 @@ from samba.auth import system_session
 
 class RodcCmdTestCase(SambaToolCmdTest):
     def setUp(self):
-        super(RodcCmdTestCase, self).setUp()
+        super().setUp()
         self.lp = samba.param.LoadParm()
         self.lp.load(os.environ["SMB_CONF_PATH"])
         self.creds = Credentials()
@@ -53,7 +53,7 @@ class RodcCmdTestCase(SambaToolCmdTest):
                                           add_members_operation=True)
 
     def tearDown(self):
-        super(RodcCmdTestCase, self).tearDown()
+        super().tearDown()
         self.ldb.deleteuser("sambatool1")
         self.ldb.deleteuser("sambatool2")
         self.ldb.deleteuser("sambatool3")
index 31f71559b921b32ce6bd49a24f23b0a18bc5dd45..5c4ac78ef53349c9ec8401cca6e70f2ba0e647ca 100644 (file)
@@ -25,7 +25,7 @@ class SchemaCmdTestCase(SambaToolCmdTest):
     samdb = None
 
     def setUp(self):
-        super(SchemaCmdTestCase, self).setUp()
+        super().setUp()
         self.samdb = self.getSamDB("-H", "ldap://%s" % os.environ["DC_SERVER"],
                                    "-U%s%%%s" % (os.environ["DC_USERNAME"], os.environ["DC_PASSWORD"]))
 
index a9515b4b896fb6918fd15afb192f56244ee8a2ef..4288f35bc94c02e968db8065061ce6a23a2e2502 100644 (file)
@@ -29,7 +29,7 @@ from samba import sites, subnets
 class BaseSitesCmdTestCase(SambaToolCmdTest):
     """Tests for samba-tool sites subnets"""
     def setUp(self):
-        super(BaseSitesCmdTestCase, self).setUp()
+        super().setUp()
         self.dburl = "ldap://%s" % os.environ["DC_SERVER"]
         self.creds_string = "-U%s%%%s" % (os.environ["DC_USERNAME"],
                                           os.environ["DC_PASSWORD"])
@@ -87,7 +87,7 @@ class SitesCmdTestCase(BaseSitesCmdTestCase):
 
 class SitesSubnetCmdTestCase(BaseSitesCmdTestCase):
     def setUp(self):
-        super(SitesSubnetCmdTestCase, self).setUp()
+        super().setUp()
         self.sitename = "testsite"
         self.sitename2 = "testsite2"
         self.samdb.transaction_start()
@@ -100,7 +100,7 @@ class SitesSubnetCmdTestCase(BaseSitesCmdTestCase):
         sites.delete_site(self.samdb, self.config_dn, self.sitename)
         sites.delete_site(self.samdb, self.config_dn, self.sitename2)
         self.samdb.transaction_commit()
-        super(SitesSubnetCmdTestCase, self).tearDown()
+        super().tearDown()
 
     def test_site_subnet_create(self):
         cidrs = (("10.9.8.0/24", self.sitename),
index 99fb6d9b2f38264af85865b31cdc9e4709a7b15d..e43a00c472e1829b2130f39ad724855537b028d9 100644 (file)
@@ -39,7 +39,7 @@ class UserCmdTestCase(SambaToolCmdTest):
     samdb = None
 
     def setUp(self):
-        super(UserCmdTestCase, self).setUp()
+        super().setUp()
         self.samdb = self.getSamDB("-H", "ldap://%s" % os.environ["DC_SERVER"],
                                    "-U%s%%%s" % (os.environ["DC_USERNAME"], os.environ["DC_PASSWORD"]))
 
@@ -83,7 +83,7 @@ class UserCmdTestCase(SambaToolCmdTest):
             user["checkUserFn"](user)
 
     def tearDown(self):
-        super(UserCmdTestCase, self).tearDown()
+        super().tearDown()
         # clean up all the left over users, just in case
         for user in self.users:
             if self._find_user(user["name"]):
index 9dcb52199e10ff06b1b1a4b4c287665625bf22cb..183b77bde81ee8fa79fb48da38b97c771c8533bb 100644 (file)
@@ -26,14 +26,14 @@ class UserCheckPwdTestCase(SambaToolCmdTest):
     samdb = None
 
     def setUp(self):
-        super(UserCheckPwdTestCase, self).setUp()
+        super().setUp()
         self.samdb = self.getSamDB("-H", "ldap://%s" % os.environ["DC_SERVER"],
                                    "-U%s%%%s" % (os.environ["DC_USERNAME"], os.environ["DC_PASSWORD"]))
         self.old_min_pwd_age = self.samdb.get_minPwdAge()
         self.samdb.set_minPwdAge("0")
 
     def tearDown(self):
-        super(UserCheckPwdTestCase, self).tearDown()
+        super().tearDown()
         self.samdb.set_minPwdAge(self.old_min_pwd_age)
 
     def _test_checkpassword(self, user, bad_password, good_password, desc):
index 1a757e3816bca7231d2af00feb0492f5176a8cef..38b1c9375b826a9dc87bba889a6e72425d085602 100644 (file)
@@ -75,7 +75,7 @@ class UserCmdCryptShaTestCase(SambaToolCmdTest):
                        password)
 
     def tearDown(self):
-        super(UserCmdCryptShaTestCase, self).tearDown()
+        super().tearDown()
         self.runsubcmd("user", "delete", USER_NAME)
 
     def _get_password(self, attributes, decrypt=False):
index 7eb91db5e32539934c8a8ce1ae3c79e211a91a68..d5f7b83da328df223d22b1689a3f65b7f79a0ba6 100644 (file)
@@ -75,7 +75,7 @@ class UserCmdCryptShaTestCase(SambaToolCmdTest):
                        password)
 
     def tearDown(self):
-        super(UserCmdCryptShaTestCase, self).tearDown()
+        super().tearDown()
         self.runsubcmd("user", "delete", USER_NAME)
 
     def _get_password(self, attributes, decrypt=False):
index 874de0d3814dd8bb3f3caa9f9c5a2e4564901648..d11531205993e37b686a0b4557e93d73ccc5e191 100644 (file)
@@ -48,7 +48,7 @@ class UserCmdWdigestTestCase(SambaToolCmdTest):
     samdb = None
 
     def setUp(self):
-        super(UserCmdWdigestTestCase, self).setUp()
+        super().setUp()
         self.lp = samba.tests.env_loadparm()
         self.samdb = self.getSamDB(
             "-H", "ldap://%s" % os.environ["DC_SERVER"],
@@ -71,7 +71,7 @@ class UserCmdWdigestTestCase(SambaToolCmdTest):
                               "Ensure user is created")
 
     def tearDown(self):
-        super(UserCmdWdigestTestCase, self).tearDown()
+        super().tearDown()
         result, out, err = self.runsubcmd("user", "delete", USER_NAME)
         self.assertCmdSuccess(result,
                               out,
index 41d318beb46cd9f1a5f97d4fc080f96f25cb78cf..f736129db8caa6333edb63d2c73dabc73facbb6e 100644 (file)
@@ -89,7 +89,7 @@ def collapse_space(s, keep_empty_lines=False):
 
 class SambaToolVisualizeLdif(SambaToolCmdTest):
     def setUp(self):
-        super(SambaToolVisualizeLdif, self).setUp()
+        super().setUp()
         self.lp = LoadParm()
         self.samdb, self.dbfile = samdb_from_ldif(MULTISITE_LDIF,
                                                   self.tempdir,
@@ -98,7 +98,7 @@ class SambaToolVisualizeLdif(SambaToolCmdTest):
 
     def tearDown(self):
         self.remove_files(self.dbfile)
-        super(SambaToolVisualizeLdif, self).tearDown()
+        super().tearDown()
 
     def remove_files(self, *files):
         for f in files:
index 048993152e2733775d1ab7d4f3ed0ad82fe6425e..a2029a07d24eed9b852c13e3c4f74e90157d5916 100644 (file)
@@ -26,7 +26,7 @@ class UpgradeDnsLmdbTestCase(SambaToolCmdTest):
     """
 
     def setUp(self):
-        super(UpgradeDnsLmdbTestCase, self).setUp()
+        super().setUp()
         self.tempsambadir = os.path.join(self.tempdir, "samba")
         os.mkdir(self.tempsambadir)
 
@@ -55,7 +55,7 @@ class UpgradeDnsLmdbTestCase(SambaToolCmdTest):
         return self.run_command(command)
 
     def tearDown(self):
-        super(UpgradeDnsLmdbTestCase, self).tearDown()
+        super().tearDown()
         shutil.rmtree(self.tempsambadir)
 
     def test_lmdb_lock_files_linked_on_upgrade_to_bind9_dlz(self):
index f7697f83fdc75eec7bbd495fa0d55591fc1926e0..e8b632bc9e261bc4fb3e34b0088e2c2b510d0374 100644 (file)
@@ -34,7 +34,7 @@ class SamDBTestCase(TestCaseInTempDir):
     """
 
     def setUp(self):
-        super(SamDBTestCase, self).setUp()
+        super().setUp()
         self.session = system_session()
         logger = logging.getLogger("selftest")
         self.domain = "dsdb"
@@ -56,7 +56,7 @@ class SamDBTestCase(TestCaseInTempDir):
         self.rm_files('names.tdb')
         self.rm_dirs('etc', 'msg.lock', 'private', 'state', 'bind-dns')
 
-        super(SamDBTestCase, self).tearDown()
+        super().tearDown()
 
 
 class SamDBTests(SamDBTestCase):
index 49e39a9546ac1c9dcdf40fab63871bd19273e6ff..5a720aa2399266180bd21936bb8557be09040e0e 100644 (file)
@@ -27,7 +27,7 @@ class SamDBApiTestCase(TestCaseInTempDir):
     def tearDown(self):
         self.rm_files("test.db", "existing.db", allow_missing=True)
 
-        super(SamDBApiTestCase, self).tearDown()
+        super().tearDown()
 
     # Attempt to open and existing non tdb file as a tdb file.
     # Don't create new db is set, the default
index fb2897e4dfc4ff13515a9b7fe59cfd775d634096..68df3dd7f42f4b8f3f0b3295f05db8074fe30d18 100644 (file)
@@ -27,7 +27,7 @@ from samba import NTSTATUSError
 class SecurityTokenTests(samba.tests.TestCase):
 
     def setUp(self):
-        super(SecurityTokenTests, self).setUp()
+        super().setUp()
         self.token = security.token()
 
     def test_is_system(self):
@@ -54,7 +54,7 @@ class SecurityTokenTests(samba.tests.TestCase):
 class SecurityDescriptorTests(samba.tests.TestCase):
 
     def setUp(self):
-        super(SecurityDescriptorTests, self).setUp()
+        super().setUp()
         self.descriptor = security.descriptor()
 
     def test_from_sddl(self):
@@ -183,7 +183,7 @@ class SecurityAceTests(samba.tests.TestCase):
     sddl_sid   = "(OA;CIIO;RPWP;aaaaaaaa-1111-bbbb-2222-dddddddddddd;33333333-eeee-4444-ffff-555555555555;S-1-5-10)"
 
     def setUp(self):
-        super(SecurityAceTests, self).setUp()
+        super().setUp()
         self.dom = security.dom_sid("S-1-2-3")
 
     def test_equality(self):
index 8c7dad0b7628fd22f7b516c1adc8e1a74624f85b..4587a0064201a838f9fad817f335b15df06827ab 100755 (executable)
@@ -36,7 +36,7 @@ test_dir = os.path.join('notify_test_%d' % random.randint(0, 0xFFFF))
 
 class SMBNotifyTests(TestCase):
     def setUp(self):
-        super(SMBNotifyTests, self).setUp()
+        super().setUp()
         self.server = samba.tests.env_get_var_value("SERVER")
 
         # create an SMB connection to the server
@@ -73,7 +73,7 @@ class SMBNotifyTests(TestCase):
         self.smb_conn_unpriv = libsmb.Conn(self.server, self.share, self.lp, creds_unpriv)
 
     def tearDown(self):
-        super(SMBNotifyTests, self).tearDown()
+        super().tearDown()
         try:
             self.smb_conn.deltree(test_dir)
         except:
index 61c1719b33031588c08fc3c3a88fe84d727664f7..89b0acac6189223b40568d68322f2f339a1486dc 100644 (file)
@@ -39,7 +39,7 @@ test_file = os.path.join(test_dir, 'testing').replace('/', '\\')
 
 class SMBTests(samba.tests.TestCase):
     def setUp(self):
-        super(SMBTests, self).setUp()
+        super().setUp()
         self.server = os.environ["SERVER"]
         creds = self.insta_creds(template=self.get_credentials())
 
@@ -51,7 +51,7 @@ class SMBTests(samba.tests.TestCase):
         self.smb_conn.mkdir(test_dir)
 
     def tearDown(self):
-        super(SMBTests, self).tearDown()
+        super().tearDown()
         try:
             self.smb_conn.deltree(test_dir)
         except:
index 6246e81d72a618686ad02a208f1a4f20d25c6692..d88bd4322390983bfbce9c0e01705d557079e3f3 100644 (file)
@@ -31,7 +31,7 @@ def posix_context(mode):
 class Smb3UnixTests(samba.tests.libsmb.LibsmbTests):
 
     def setUp(self):
-        super(Smb3UnixTests, self).setUp()
+        super().setUp()
 
         self.samsid = os.environ["SAMSID"]
 
index ede1818bf89f4a2b02c655656a684b4d67bad444..b67ba7e5e4111ed54b7e94a9ce8fb83504b36916 100644 (file)
@@ -29,7 +29,7 @@ class SmbdBaseTests(TestCaseInTempDir):
         return curr_umask
 
     def setUp(self):
-        super(SmbdBaseTests, self).setUp()
+        super().setUp()
         self.orig_umask = self.get_umask()
 
         # set an arbitrary umask - the underlying smbd code should override
@@ -45,4 +45,4 @@ class SmbdBaseTests(TestCaseInTempDir):
         # restore the original umask value (before we interfered with it)
         os.umask(self.orig_umask)
 
-        super(SmbdBaseTests, self).tearDown()
+        super().tearDown()
index 88d68faa65c5a7c22d99cc078728ff6e56901a3f..26d3300760c4535a9393021de90119736ea7b1f8 100644 (file)
@@ -60,4 +60,4 @@ class TestProgram(BaseTestProgram):
         if getattr(opts, 'load_list', None):
             args.insert(0, "--load-list=%s" % opts.load_list)
         argv = [sys.argv[0]] + args
-        super(TestProgram, self).__init__(module=module, argv=argv)
+        super().__init__(module=module, argv=argv)
index f1024776186ac3c0de8f006eb63a9b40f3053b6d..ba097fa92db942212003c91bcc78be5b117410a1 100644 (file)
@@ -123,7 +123,7 @@ class UpgradeProvisionTestCase(TestCaseInTempDir):
 class UpdateSecretsTests(samba.tests.TestCaseInTempDir):
 
     def setUp(self):
-        super(UpdateSecretsTests, self).setUp()
+        super().setUp()
         self.referencedb = create_dummy_secretsdb(
             os.path.join(self.tempdir, "ref.ldb"))
 
@@ -152,4 +152,4 @@ class UpdateSecretsTests(samba.tests.TestCaseInTempDir):
             path = os.path.join(self.tempdir, name)
             if os.path.exists(path):
                 os.unlink(path)
-        super(UpdateSecretsTests, self).tearDown()
+        super().tearDown()
index d3f7b19dfd9368ec359753025b7f1ccb9da8fd22..432ca2ef55e8007e43711760e606f4d17ef89945 100644 (file)
@@ -76,7 +76,7 @@ class UpgradeProvisionWithLdbTestCase(TestCaseInTempDir):
         return os.path.join(self.tempdir, "sam.ldb")
 
     def setUp(self):
-        super(UpgradeProvisionWithLdbTestCase, self).setUp()
+        super().setUp()
         paths = get_paths(param, None, smb_conf_path)
         self.creds = Credentials()
         self.lp = env_loadparm()
@@ -178,4 +178,4 @@ class UpgradeProvisionWithLdbTestCase(TestCaseInTempDir):
             path = os.path.join(self.tempdir, name)
             if os.path.exists(path):
                 os.unlink(path)
-        super(UpgradeProvisionWithLdbTestCase, self).tearDown()
+        super().tearDown()