python: get rid of pointless empty overridden methods
authorRob van der Linde <rob@catalyst.net.nz>
Tue, 28 Nov 2023 02:59:41 +0000 (15:59 +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>
33 files changed:
python/samba/tests/audit_log_pass_change.py
python/samba/tests/auth_log.py
python/samba/tests/auth_log_ncalrpc.py
python/samba/tests/auth_log_pass_change.py
python/samba/tests/blackbox/netads_json.py
python/samba/tests/blackbox/smbcacls_basic.py
python/samba/tests/blackbox/smbcacls_dfs_propagate_inherit.py
python/samba/tests/dcerpc/binding.py
python/samba/tests/dcerpc/createtrustrelax.py
python/samba/tests/dns.py
python/samba/tests/dsdb_schema_attributes.py
python/samba/tests/glue.py
python/samba/tests/gpo.py
python/samba/tests/gpo_member.py
python/samba/tests/ldap_referrals.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/ntlmdisabled.py
python/samba/tests/password_hash_fl2003.py
python/samba/tests/password_hash_fl2008.py
python/samba/tests/password_hash_gpgme.py
python/samba/tests/password_hash_ldap.py
python/samba/tests/prefork_restart.py
python/samba/tests/process_limits.py
python/samba/tests/s3_net_join.py
python/samba/tests/samba_tool/schema.py
python/samba/tests/samba_tool/user_virtualCryptSHA.py
python/samba/tests/samba_tool/user_virtualCryptSHA_base.py
python/samba/tests/samba_tool/visualize_drs.py
python/samba/tests/samdb_api.py
python/samba/tests/tdb_util.py

index f7229a670d7225244637de3af597e8fb966edca0..25fe2b5664ad850dea03ec1b0c0a10273046a981 100644 (file)
@@ -98,9 +98,6 @@ class AuditLogPassChangeTests(AuditLogTestBase):
         self.waitForMessages(1, dn=dn)
         self.discardMessages()
 
-    def tearDown(self):
-        super(AuditLogPassChangeTests, self).tearDown()
-
     def test_net_change_password(self):
 
         dn = "CN=" + USER_NAME + ",CN=Users," + self.base_dn
index 98ab4603f98426618b32057396d2d44570a73128..41e7767b75cdcdcf6400660197b57d79fefea2df 100755 (executable)
@@ -50,9 +50,6 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase):
         super(AuthLogTests, self).setUp()
         self.remoteAddress = os.environ["CLIENT_IP"]
 
-    def tearDown(self):
-        super(AuthLogTests, self).tearDown()
-
     def smb_connection(self, creds, use_spnego="yes", ntlmv2_auth="yes",
                        force_smb1=False):
         # the SMB bindings rely on having a s3 loadparm
index 511e575d9bd091ac902367b29757c477b8169be2..0941a64571b11acc96f9d7436fdf68b1971ac1f0 100644 (file)
@@ -35,9 +35,6 @@ class AuthLogTestsNcalrpc(samba.tests.auth_log_base.AuthLogTestBase):
         super(AuthLogTestsNcalrpc, self).setUp()
         self.remoteAddress = AS_SYSTEM_MAGIC_PATH_TOKEN
 
-    def tearDown(self):
-        super(AuthLogTestsNcalrpc, self).tearDown()
-
     def _test_rpc_ncaclrpc(self, authTypes, binding, creds,
                            protection, checkFunction):
 
index b8737effca6f736cadb83e6369907465b7fa425d..a9dc2b328d4583ad76a972be0d47852a4fc4c17f 100644 (file)
@@ -71,9 +71,6 @@ class AuthLogPassChangeTests(samba.tests.auth_log_base.AuthLogTestBase):
     def _authDescription(self):
         return "samr_ChangePasswordUser4"
 
-    def tearDown(self):
-        super(AuthLogPassChangeTests, self).tearDown()
-
     def test_admin_change_password(self):
         def isLastExpectedMessage(msg):
             return ((msg["type"] == "Authentication") and
index bcae96259c95af7b124db5667b0438b074604aa7..706ec3fba52e21b2d9bfed9bc6f9b8ee52af34b9 100644 (file)
@@ -35,9 +35,6 @@ class BaseWrapper (object):
         """Blackbox tests for JSON output of the net ads suite of commands."""
         subcmd = None
 
-        def setUp(self):
-            super(BaseWrapper.NetAdsJSONTests_Base, self).setUp()
-
         def test_json_wellformed (self):
             """The output of ``--json`` commands must parse as JSON."""
             argv = "%s %s --json" % (COMMAND, self.subcmd)
index 7d313639863e7afd2a117e2839384ca6a24e2160..766069255d4a4ec661a83397019b87e7f1947d8e 100644 (file)
@@ -20,9 +20,6 @@ from samba.tests import BlackboxProcessError
 
 class BasicSmbCaclsTests(SmbCaclsBlockboxTestBase):
 
-    def setUp(self):
-        super(BasicSmbCaclsTests, self).setUp()
-
     def test_simple_single_set(self):
         """test smbcacls '--set' attempts to overwrite the ACL for the file
 
index bdb00e9dc957f5c5c6c193c3d549c59bbb032efa..eed96d3ecf498d7e1e67b7570f7a54692c87e51e 100644 (file)
@@ -82,6 +82,3 @@ class DfsInheritanceSmbCaclsTests(InheritanceSmbCaclsTests):
         self.smb_cacls(["--modify", file_acl_str, self.f1])
         self.smb_cacls(["--modify", file_acl_str, self.f2])
         self.smb_cacls(["--modify", file_acl_str, self.f3])
-
-    def tearDown(self):
-        super(DfsInheritanceSmbCaclsTests, self).tearDown()
index 24e4ac77d896c29014562669bb7c157d92316a9d..1ad1f2964c6b5e186d5914cf284a06d57e103fca 100644 (file)
@@ -26,8 +26,6 @@ from samba.credentials import Credentials, SMB_ENCRYPTION_REQUIRED, SMB_ENCRYPTI
 from samba import NTSTATUSError
 
 class RpcBindingTests(RpcInterfaceTestCase):
-    def setUp(self):
-        super(RpcBindingTests, self).setUp()
 
     def get_user_creds(self):
         c = Credentials()
index 48beb0f968042bf66b6836fd32975fc5953fbe0f..5dcb9374bce43bafff568f205098762694a0585d 100644 (file)
@@ -27,8 +27,6 @@ from samba.credentials import Credentials, SMB_ENCRYPTION_REQUIRED, SMB_ENCRYPTI
 from samba.trust_utils import CreateTrustedDomainRelax
 
 class CreateTrustedDomainRelaxTest(TestCase):
-    def setUp(self):
-        super(CreateTrustedDomainRelaxTest, self).setUp()
 
     def get_user_creds(self):
         c = Credentials()
index 62929289b08cf485d5dc7a2e5de4c3ee615190ea..8888790378d3de87ac782e33d9dda5b535392bc6 100644 (file)
@@ -1772,9 +1772,6 @@ class TestRPCRoundtrip(DNSTest):
                                             self.lp,
                                             self.creds)
 
-    def tearDown(self):
-        super(TestRPCRoundtrip, self).tearDown()
-
     def rpc_update(self, fqn=None, data=None, wType=None, delete=False):
         fqn = fqn or ("rpctestrec." + self.get_dns_domain())
 
index d9b538d4af43f4f347cdc5b8f280120ad2e05e9f..37b44c6d3adeb67932efb360d952ac55a8fbaa66 100644 (file)
@@ -46,9 +46,6 @@ class SchemaAttributesTestCase(samba.tests.TestCase):
         self.base_dn = res[0]["defaultNamingContext"][0]
         self.forest_level = int(res[0]["forestFunctionality"][0])
 
-    def tearDown(self):
-        super(SchemaAttributesTestCase, self).tearDown()
-
     def _ldap_schemaUpdateNow(self):
         ldif = """
 dn:
index e5d76c5a02a295a83788634dccc8784561195e52..ac504b3f3669e044ca3037754338f7770ae55e2c 100644 (file)
@@ -24,9 +24,6 @@ import samba.tests
 
 class GlueTests(samba.tests.TestCase):
 
-    def setUp(self):
-        super(GlueTests, self).setUp()
-
     def test_generate_random_str(self):
         string = _glue.generate_random_str(10)
         self.assertEqual(type(string), str)
index f85780685d604c0a67b1f47946a0bf0b51af58f4..86ffdf26a288221b0be966ca45bfba2ece7348dc 100644 (file)
@@ -5098,9 +5098,6 @@ class GPOTests(tests.TestCase):
         self.lp.load_default()
         self.creds = self.insta_creds(template=self.get_credentials())
 
-    def tearDown(self):
-        super(GPOTests, self).tearDown()
-
     def test_gpo_list(self):
         global poldir, dspath
         gpos = get_gpo_list(self.server, self.creds, self.lp,
index 1b8779b1ace31ad891897325f81882f1ac2094b1..047471f0e2841db6ea4c467c02c6644cbb8b3a79 100644 (file)
@@ -29,9 +29,6 @@ class GPOTests(tests.TestCase):
         self.lp.load_default()
         self.creds = self.insta_creds(template=self.get_credentials())
 
-    def tearDown(self):
-        super(GPOTests, self).tearDown()
-
     def test_sec_ext_load_on_member(self):
         cache_dir = self.lp.get('cache directory')
         store = GPOStorage(os.path.join(cache_dir, 'gpo.tdb'))
index eade5ef668208de770423a2abb1e470abe0e60da..406b1965fdd6ace1df3b64a8b2babeb205011d26 100644 (file)
@@ -48,9 +48,6 @@ creds = credopts.get_credentials(lp)
 
 class LdapReferralTest(samba.tests.TestCase):
 
-    def setUp(self):
-        super(LdapReferralTest, self).setUp()
-
     # The referral entries for an ldap request should have the ldap scheme
     # i.e. then should all start with "ldap://"
     def test_ldap_search(self):
index 640e96d56f5056ecb2bf5b094f955aae53b2611c..20f0e57e8743f5e570c0c08417f8e3792072b988 100644 (file)
@@ -39,9 +39,6 @@ class NetJoinTests(samba.tests.TestCaseInTempDir):
         self.lp.set("lock dir", self.tempdir)
         self.lp.set("state directory", self.tempdir)
 
-    def tearDown(self):
-        super(NetJoinTests, self).tearDown()
-
     def test_net_join(self):
         netbios_name = "NetJoinTest"
         machinepass  = "abcdefghij"
index 70a9007324f896e9b64c0a2c699e71c4bbc3cb16..747f3c55b9942d8b1015083a6ed535b8591044a4 100644 (file)
@@ -39,9 +39,6 @@ class NetJoinNoSpnegoTests(samba.tests.TestCaseInTempDir):
         self.lp.set("lock dir", self.tempdir)
         self.lp.set("state directory", self.tempdir)
 
-    def tearDown(self):
-        super(NetJoinNoSpnegoTests, self).tearDown()
-
     def test_net_join_no_spnego(self):
         self.lp.set("client ipc max protocol", "NT1")
         self.lp.set("client use spnego", "no")
index f28b789bab700fb5b0ca14b3065c0f9e5376d2d4..9a0807215a3ee60435254e79bcd5fde7937ef682 100644 (file)
@@ -27,9 +27,6 @@ class NetBiosTests(samba.tests.TestCase):
         self.ifc = os.environ["SERVER_IP"]
         self.dc = os.environ["DC_NETBIOSNAME"]
 
-    def tearDown(self):
-        super(NetBiosTests, self).tearDown()
-
     def test_query_name(self):
         (reply_from, names, addresses) = self.n.query_name(self.dc, self.ifc, timeout=4)
         assert reply_from == self.ifc
index 86ac22de5a306be0637d7e240064cf2412cbd504..70efd6d2b060a62ba37b8b4f052af92617a735dc 100644 (file)
@@ -47,9 +47,6 @@ class NetlogonServiceTests(TestCase):
 
         self.creds.guess(self.lp)
 
-    def tearDown(self):
-        super(NetlogonServiceTests, self).tearDown()
-
     def test_have_netlogon_connection(self):
         try:
             c = self.get_netlogon_connection()
index 523ff792a7af8dee3c1c267bc33d9c436623ad53..0365694cab00d57c565b0f41478ad8b1fca5c11c 100644 (file)
@@ -46,9 +46,6 @@ class NtlmDisabledTests(TestCase):
         self.creds.set_password(os.getenv("PASSWORD"))
         self.creds.set_kerberos_state(DONT_USE_KERBEROS)
 
-    def tearDown(self):
-        super(NtlmDisabledTests, self).tearDown()
-
     def test_ntlm_connection(self):
         try:
             conn = srvsvc.srvsvc("ncacn_np:%s[smb2,ntlm]" % self.server, self.lp, self.creds)
index c412a0676e65d3a204c012ae8f41fb72d1732497..ff9b237b844feede6d0313b3529a7c42b60e53fd 100644 (file)
@@ -38,9 +38,6 @@ import binascii
 
 class PassWordHashFl2003Tests(PassWordHashTests):
 
-    def setUp(self):
-        super(PassWordHashFl2003Tests, self).setUp()
-
     def test_default_supplementalCredentials(self):
         self.add_user(options=[("password hash userPassword schemes", "")])
 
index a43ac3f815b608f5436d9738390358a4566647f7..c1ceeb7b36d3792cd38173143f11fa4de448dd4e 100644 (file)
@@ -37,9 +37,6 @@ import binascii
 
 class PassWordHashFl2008Tests(PassWordHashTests):
 
-    def setUp(self):
-        super(PassWordHashFl2008Tests, self).setUp()
-
     def test_default_supplementalCredentials(self):
         self.add_user()
 
index 16247bc34510e47998bee3bb58c7c79585de3e9b..9c0a511e1b6fa36d4a39926d50da20b4f3dc46ae 100644 (file)
@@ -40,9 +40,6 @@ import samba
 
 class PassWordHashGpgmeTests(PassWordHashTests):
 
-    def setUp(self):
-        super(PassWordHashGpgmeTests, self).setUp()
-
     def test_default_supplementalCredentials(self):
         self.add_user()
         if not self.lp.get("password hash gpg key ids"):
index 7e685dd2c05a9ede66db659145fcc59f20bec38f..2657e759ec48085c85d2e5a2d58486fe43be0833 100644 (file)
@@ -55,9 +55,6 @@ def attid_equal(a1, a2):
 
 class PassWordHashLDAPTests(PassWordHashTests):
 
-    def setUp(self):
-        super(PassWordHashLDAPTests, self).setUp()
-
     # Get the supplemental credentials for the user under test
     def get_supplemental_creds_drs(self):
         binding_str = "ncacn_ip_tcp:%s[seal]" % os.environ["SERVER"]
index 9e35bd68a17a5a7d5aa3430ae4d67429ba6395a8..ef601dd5d7dd1c90278aca1c1ffe5310164817d0 100644 (file)
@@ -49,9 +49,6 @@ class PreforkProcessRestartTests(TestCase):
         lp_ctx = self.get_loadparm()
         self.msg_ctx = Messaging(lp_ctx=lp_ctx)
 
-    def tearDown(self):
-        super(PreforkProcessRestartTests, self).tearDown()
-
     def get_process_data(self):
         services = self.msg_ctx.irpc_all_servers()
 
index b1997acad67dbfbb79bbaad10e0c474c61b2fd29..e9800053b877975dcc888d3e3d3eda8c7ac1dba1 100644 (file)
@@ -30,12 +30,6 @@ from ldb import LdbError, ERR_OPERATIONS_ERROR
 
 class StandardModelProcessLimitTests(TestCase):
 
-    def setUp(self):
-        super(StandardModelProcessLimitTests, self).setUp()
-
-    def tearDown(self):
-        super(StandardModelProcessLimitTests, self).tearDown()
-
     def simple_bind(self):
         creds = self.insta_creds(template=self.get_credentials())
         creds.set_bind_dn("%s\\%s" % (creds.get_domain(),
index cdb414c75dc4917e11a7c10540c75c5cd12b28f0..2150e4e25b7872331d56cb38dd362a6f72c0d464 100644 (file)
@@ -45,9 +45,6 @@ class NetS3JoinTests(samba.tests.TestCaseInTempDir):
         self.server = os.environ["SERVER"]
         self.lp = self.get_loadparm()
 
-    def tearDown(self):
-        super(NetS3JoinTests, self).tearDown()
-
     def test_net_join(self):
         netbios_name = "S3NetJoinTest"
         machinepass  = "abcdefghij"
index 6f899ef4b685f6cb52675dd3b3f62d1fe9985842..31f71559b921b32ce6bd49a24f23b0a18bc5dd45 100644 (file)
@@ -29,9 +29,6 @@ class SchemaCmdTestCase(SambaToolCmdTest):
         self.samdb = self.getSamDB("-H", "ldap://%s" % os.environ["DC_SERVER"],
                                    "-U%s%%%s" % (os.environ["DC_USERNAME"], os.environ["DC_PASSWORD"]))
 
-    def tearDown(self):
-        super(SchemaCmdTestCase, self).tearDown()
-
     def test_display_attribute(self):
         """Tests that we can display schema attributes"""
         (result, out, err) = self.runsublevelcmd("schema", ("attribute",
index 7b8e0cea2c55adab726ee1c5de18c5373d92c5c4..1a757e3816bca7231d2af00feb0492f5176a8cef 100644 (file)
@@ -55,9 +55,6 @@ class UserCmdCryptShaTestCase(SambaToolCmdTest):
     users = []
     samdb = None
 
-    def setUp(self):
-        super(UserCmdCryptShaTestCase, self).setUp()
-
     def add_user(self, hashes=""):
         self.lp = samba.tests.env_loadparm()
 
index d4897ec5a523da497af04df310a0aa63da116d63..7eb91db5e32539934c8a8ce1ae3c79e211a91a68 100644 (file)
@@ -55,9 +55,6 @@ class UserCmdCryptShaTestCase(SambaToolCmdTest):
     users = []
     samdb = None
 
-    def setUp(self):
-        super(UserCmdCryptShaTestCase, self).setUp()
-
     def add_user(self, hashes=""):
         self.lp = samba.tests.env_loadparm()
 
index 9a2ca25039b7d7e0b62a2134f426298005ca68b6..64b2cdbe7404ef42b0ec079b1f42e255bbc1650a 100644 (file)
@@ -107,8 +107,6 @@ def get_utf8_matrix(s):
 
 
 class SambaToolVisualizeDrsTest(SambaToolCmdTest):
-    def setUp(self):
-        super(SambaToolVisualizeDrsTest, self).setUp()
 
     def test_ntdsconn(self):
         server = "ldap://%s" % os.environ["SERVER"]
index a653ca089a281c7b4227d5f9e97b8bb15f9cab92..49e39a9546ac1c9dcdf40fab63871bd19273e6ff 100644 (file)
@@ -24,9 +24,6 @@ import errno
 
 class SamDBApiTestCase(TestCaseInTempDir):
 
-    def setUp(self):
-        super(SamDBApiTestCase, self).setUp()
-
     def tearDown(self):
         self.rm_files("test.db", "existing.db", allow_missing=True)
 
index 93c83a87910b7bc75fbc77192e6012c93c55c246..e8e5d7272452a3157d9d67cdd1172feaf7e56dc0 100644 (file)
@@ -23,9 +23,6 @@ import os
 
 class TDBUtilTests(samba.tests.TestCaseInTempDir):
 
-    def setUp(self):
-        super(TDBUtilTests, self).setUp()
-
     def test_tdb_copy(self):
         src_ldb_file = os.path.join(self.tempdir, "source.ldb")
         dst_ldb_file = os.path.join(self.tempdir, "destination.ldb")