From: Douglas Bagnall Date: Thu, 19 Aug 2021 23:26:02 +0000 (+1200) Subject: pytest: s3_net_join: avoid name clash X-Git-Tag: ldb-2.5.0~375 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4a75eead058879b11c8a0901d7277052123d13b;p=thirdparty%2Fsamba.git pytest: s3_net_join: avoid name clash The net_join test uses "NetJoinTest" (and doesn't properly clean up), we must use a unique name for this test in s3_net_join.py. [abartlet@samba.org The hilarious naming conventions come from a time when samba-tool was known as "net" in the s4 branch] BUG: https://bugzilla.samba.org/show_bug.cgi?id=14869 Signed-off-by: Douglas Bagnall Reviewed-by: Stefan Metzmacher --- diff --git a/python/samba/tests/s3_net_join.py b/python/samba/tests/s3_net_join.py index dd691e4a116..cdb414c75dc 100644 --- a/python/samba/tests/s3_net_join.py +++ b/python/samba/tests/s3_net_join.py @@ -49,7 +49,7 @@ class NetS3JoinTests(samba.tests.TestCaseInTempDir): super(NetS3JoinTests, self).tearDown() def test_net_join(self): - netbios_name = "NetJoinTest" + netbios_name = "S3NetJoinTest" machinepass = "abcdefghij" creds = self.insta_creds(template=self.get_credentials(), kerberos_state=DONT_USE_KERBEROS)