git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 94778b6)
s4:tests: Reformat kerberos tests
authorAndreas Schneider <asn@samba.org>
Mon, 13 Mar 2023 10:38:02 +0000 (11:38 +0100)
committerAndreas Schneider <asn@cryptomilk.org>
Thu, 6 Apr 2023 13:45:35 +0000 (13:45 +0000)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15336

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
source4/selftest/tests.py patch | blob | history

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index f9e37610bdc1d3a2fe3558fbf912144acfa51982..a2bf9ab98e7aee0f264a922d3adcc39e2c979b71 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -568,24 +568,254 @@ plantestsuite("samba4.blackbox.test_primary_group", "ad_dc:local", [os.path.join
 plantestsuite("samba4.blackbox.test_old_enctypes", "fl2003dc:local", [os.path.join(bbdir, "test_old_enctypes.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$NETBIOSNAME', '$PREFIX_ABS'])
 
 if have_heimdal_support:
-    plantestsuite("samba4.blackbox.kinit", "ad_dc_ntvfs:local", [os.path.join(bbdir, "test_kinit_heimdal.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", smbclient4, configuration])
-    plantestsuite("samba4.blackbox.kinit", "fl2000dc:local", [os.path.join(bbdir, "test_kinit_heimdal.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "arcfour-hmac-md5", smbclient3, configuration])
-    plantestsuite("samba4.blackbox.kinit", "fl2008r2dc:local", [os.path.join(bbdir, "test_kinit_heimdal.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", smbclient3, configuration])
-    plantestsuite("samba4.blackbox.kinit_trust", "fl2008r2dc:local", [os.path.join(bbdir, "test_kinit_trusts_heimdal.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$TRUST_SERVER', '$TRUST_USERNAME', '$TRUST_PASSWORD', '$TRUST_REALM', '$TRUST_DOMAIN', '$PREFIX', "forest", "aes256-cts-hmac-sha1-96"])
-    plantestsuite("samba4.blackbox.kinit_trust", "fl2003dc:local", [os.path.join(bbdir, "test_kinit_trusts_heimdal.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$TRUST_SERVER', '$TRUST_USERNAME', '$TRUST_PASSWORD', '$TRUST_REALM', '$TRUST_DOMAIN', '$PREFIX', "external", "arcfour-hmac-md5"])
-    plantestsuite("samba4.blackbox.kinit_trust", "fl2000dc:local", [os.path.join(bbdir, "test_kinit_trusts_heimdal.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$TRUST_SERVER', '$TRUST_USERNAME', '$TRUST_PASSWORD', '$TRUST_REALM', '$TRUST_DOMAIN', '$PREFIX', "external", "arcfour-hmac-md5"])
-    plantestsuite("samba4.blackbox.export.keytab", "ad_dc_ntvfs:local", [os.path.join(bbdir, "test_export_keytab_heimdal.sh"), '$SERVER', '$USERNAME', '$REALM', '$DOMAIN', "$PREFIX", smbclient4])
-    plantestsuite("samba4.blackbox.kpasswd", "ad_dc_ntvfs:local", [os.path.join(bbdir, "test_kpasswd_heimdal.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', "$PREFIX/ad_dc_ntvfs"])
-    plantestsuite("samba4.blackbox.krb5.s4u", "fl2008r2dc:local", [os.path.join(bbdir, "test_s4u_heimdal.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$TRUST_SERVER', '$TRUST_USERNAME', '$TRUST_PASSWORD', '$TRUST_REALM', '$TRUST_DOMAIN', '$PREFIX', configuration])
+    plantestsuite("samba4.blackbox.kinit",
+                  "ad_dc_ntvfs:local",
+                  [
+                      os.path.join(bbdir, "test_kinit_heimdal.sh"),
+                      '$SERVER',
+                      '$USERNAME',
+                      '$PASSWORD',
+                      '$REALM',
+                      '$DOMAIN',
+                      '$PREFIX',
+                      "aes256-cts-hmac-sha1-96",
+                      smbclient4,
+                      configuration
+                  ])
+    plantestsuite("samba4.blackbox.kinit",
+                  "fl2000dc:local",
+                  [
+                      os.path.join(bbdir, "test_kinit_heimdal.sh"),
+                      '$SERVER',
+                      '$USERNAME',
+                      '$PASSWORD',
+                      '$REALM',
+                      '$DOMAIN',
+                      '$PREFIX',
+                      "arcfour-hmac-md5",
+                      smbclient3,
+                      configuration
+                  ])
+    plantestsuite("samba4.blackbox.kinit",
+                  "fl2008r2dc:local",
+                  [
+                      os.path.join(bbdir, "test_kinit_heimdal.sh"),
+                      '$SERVER',
+                      '$USERNAME',
+                      '$PASSWORD',
+                      '$REALM',
+                      '$DOMAIN',
+                      '$PREFIX',
+                      "aes256-cts-hmac-sha1-96",
+                      smbclient3,
+                      configuration
+                  ])
+    plantestsuite("samba4.blackbox.kinit_trust",
+                  "fl2008r2dc:local",
+                  [
+                      os.path.join(bbdir, "test_kinit_trusts_heimdal.sh"),
+                      '$SERVER',
+                      '$USERNAME',
+                      '$PASSWORD',
+                      '$REALM',
+                      '$DOMAIN',
+                      '$TRUST_SERVER',
+                      '$TRUST_USERNAME',
+                      '$TRUST_PASSWORD',
+                      '$TRUST_REALM',
+                      '$TRUST_DOMAIN',
+                      '$PREFIX',
+                      "forest",
+                      "aes256-cts-hmac-sha1-96"
+                  ])
+    plantestsuite("samba4.blackbox.kinit_trust",
+                  "fl2003dc:local",
+                  [
+                      os.path.join(bbdir, "test_kinit_trusts_heimdal.sh"),
+                      '$SERVER',
+                      '$USERNAME',
+                      '$PASSWORD',
+                      '$REALM',
+                      '$DOMAIN',
+                      '$TRUST_SERVER',
+                      '$TRUST_USERNAME',
+                      '$TRUST_PASSWORD',
+                      '$TRUST_REALM',
+                      '$TRUST_DOMAIN',
+                      '$PREFIX',
+                      "external",
+                      "arcfour-hmac-md5"
+                  ])
+    plantestsuite("samba4.blackbox.kinit_trust",
+                  "fl2000dc:local",
+                  [
+                      os.path.join(bbdir, "test_kinit_trusts_heimdal.sh"),
+                      '$SERVER',
+                      '$USERNAME',
+                      '$PASSWORD',
+                      '$REALM',
+                      '$DOMAIN',
+                      '$TRUST_SERVER',
+                      '$TRUST_USERNAME',
+                      '$TRUST_PASSWORD',
+                      '$TRUST_REALM',
+                      '$TRUST_DOMAIN',
+                      '$PREFIX',
+                      "external",
+                      "arcfour-hmac-md5"
+                  ])
+    plantestsuite("samba4.blackbox.export.keytab",
+                  "ad_dc_ntvfs:local",
+                  [
+                      os.path.join(bbdir, "test_export_keytab_heimdal.sh"),
+                      '$SERVER',
+                      '$USERNAME',
+                      '$REALM',
+                      '$DOMAIN',
+                      "$PREFIX",
+                      smbclient4
+                  ])
+    plantestsuite("samba4.blackbox.kpasswd",
+                  "ad_dc_ntvfs:local",
+                  [
+                      os.path.join(bbdir, "test_kpasswd_heimdal.sh"),
+                      '$SERVER',
+                      '$USERNAME',
+                      '$PASSWORD',
+                      '$REALM',
+                      '$DOMAIN',
+                      "$PREFIX/ad_dc_ntvfs"
+                  ])
+    plantestsuite("samba4.blackbox.krb5.s4u",
+                  "fl2008r2dc:local",
+                  [
+                      os.path.join(bbdir, "test_s4u_heimdal.sh"),
+                      '$SERVER',
+                      '$USERNAME',
+                      '$PASSWORD',
+                      '$REALM',
+                      '$DOMAIN',
+                      '$TRUST_SERVER',
+                      '$TRUST_USERNAME',
+                      '$TRUST_PASSWORD',
+                      '$TRUST_REALM',
+                      '$TRUST_DOMAIN',
+                      '$PREFIX',
+                      configuration
+                  ])
 else:
-    plantestsuite("samba4.blackbox.kinit", "ad_dc_ntvfs:local", [os.path.join(bbdir, "test_kinit_mit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', smbclient4, configuration])
-    plantestsuite("samba4.blackbox.kinit", "fl2000dc:local", [os.path.join(bbdir, "test_kinit_mit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', smbclient3, configuration])
-    plantestsuite("samba4.blackbox.kinit", "fl2008r2dc:local", [os.path.join(bbdir, "test_kinit_mit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', smbclient3, configuration])
-    plantestsuite("samba4.blackbox.kinit_trust", "fl2008r2dc:local", [os.path.join(bbdir, "test_kinit_trusts_mit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$TRUST_SERVER', '$TRUST_USERNAME', '$TRUST_PASSWORD', '$TRUST_REALM', '$TRUST_DOMAIN', '$PREFIX', "forest"])
-    plantestsuite("samba4.blackbox.kinit_trust", "fl2003dc:local", [os.path.join(bbdir, "test_kinit_trusts_mit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$TRUST_SERVER', '$TRUST_USERNAME', '$TRUST_PASSWORD', '$TRUST_REALM', '$TRUST_DOMAIN', '$PREFIX', "external"])
-    plantestsuite("samba4.blackbox.kinit_trust", "fl2000dc:local", [os.path.join(bbdir, "test_kinit_trusts_mit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$TRUST_SERVER', '$TRUST_USERNAME', '$TRUST_PASSWORD', '$TRUST_REALM', '$TRUST_DOMAIN', '$PREFIX', "external"])
-    plantestsuite("samba4.blackbox.export.keytab", "ad_dc_ntvfs:local", [os.path.join(bbdir, "test_export_keytab_mit.sh"), '$SERVER', '$USERNAME', '$REALM', '$DOMAIN', "$PREFIX", smbclient4])
-    plantestsuite("samba4.blackbox.kpasswd", "ad_dc_ntvfs:local", [os.path.join(bbdir, "test_kpasswd_mit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', "$PREFIX/ad_dc_ntvfs"])
+    plantestsuite("samba4.blackbox.kinit",
+                  "ad_dc_ntvfs:local",
+                  [
+                      os.path.join(bbdir, "test_kinit_mit.sh"),
+                      '$SERVER',
+                      '$USERNAME',
+                      '$PASSWORD',
+                      '$REALM',
+                      '$DOMAIN',
+                      '$PREFIX',
+                      smbclient4,
+                      configuration
+                  ])
+    plantestsuite("samba4.blackbox.kinit",
+                  "fl2000dc:local",
+                  [
+                      os.path.join(bbdir, "test_kinit_mit.sh"),
+                      '$SERVER',
+                      '$USERNAME',
+                      '$PASSWORD',
+                      '$REALM',
+                      '$DOMAIN',
+                      '$PREFIX',
+                      smbclient3,
+                      configuration
+                  ])
+    plantestsuite("samba4.blackbox.kinit",
+                  "fl2008r2dc:local",
+                  [
+                      os.path.join(bbdir, "test_kinit_mit.sh"),
+                      '$SERVER',
+                      '$USERNAME',
+                      '$PASSWORD',
+                      '$REALM',
+                      '$DOMAIN',
+                      '$PREFIX',
+                      smbclient3,
+                      configuration
+                  ])
+    plantestsuite("samba4.blackbox.kinit_trust",
+                  "fl2008r2dc:local",
+                  [
+                      os.path.join(bbdir, "test_kinit_trusts_mit.sh"),
+                      '$SERVER',
+                      '$USERNAME',
+                      '$PASSWORD',
+                      '$REALM',
+                      '$DOMAIN',
+                      '$TRUST_SERVER',
+                      '$TRUST_USERNAME',
+                      '$TRUST_PASSWORD',
+                      '$TRUST_REALM',
+                      '$TRUST_DOMAIN',
+                      '$PREFIX',
+                      "forest"
+                  ])
+    plantestsuite("samba4.blackbox.kinit_trust",
+                  "fl2003dc:local",
+                  [
+                      os.path.join(bbdir, "test_kinit_trusts_mit.sh"),
+                      '$SERVER',
+                      '$USERNAME',
+                      '$PASSWORD',
+                      '$REALM',
+                      '$DOMAIN',
+                      '$TRUST_SERVER',
+                      '$TRUST_USERNAME',
+                      '$TRUST_PASSWORD',
+                      '$TRUST_REALM',
+                      '$TRUST_DOMAIN',
+                      '$PREFIX',
+                      "external"
+                  ])
+    plantestsuite("samba4.blackbox.kinit_trust",
+                  "fl2000dc:local",
+                  [
+                      os.path.join(bbdir, "test_kinit_trusts_mit.sh"),
+                      '$SERVER',
+                      '$USERNAME',
+                      '$PASSWORD',
+                      '$REALM',
+                      '$DOMAIN',
+                      '$TRUST_SERVER',
+                      '$TRUST_USERNAME',
+                      '$TRUST_PASSWORD',
+                      '$TRUST_REALM',
+                      '$TRUST_DOMAIN',
+                      '$PREFIX',
+                      "external"
+                  ])
+    plantestsuite("samba4.blackbox.export.keytab",
+                  "ad_dc_ntvfs:local",
+                  [
+                      os.path.join(bbdir, "test_export_keytab_mit.sh"),
+                      '$SERVER',
+                      '$USERNAME',
+                      '$REALM',
+                      '$DOMAIN',
+                      "$PREFIX",
+                      smbclient4
+                  ])
+    plantestsuite("samba4.blackbox.kpasswd",
+                  "ad_dc_ntvfs:local",
+                  [
+                      os.path.join(bbdir, "test_kpasswd_mit.sh"),
+                      '$SERVER',
+                      '$USERNAME',
+                      '$PASSWORD',
+                      '$REALM',
+                      '$DOMAIN',
+                      "$PREFIX/ad_dc_ntvfs"
+                  ])
 
 plantestsuite("samba4.blackbox.pkinit_simple",
               "ad_dc:local",
Samba Shared Repository