[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  ffb836f selftest: Impove test names for samba.wbinfo_simple
       via  782358a testprogs: Return the correct error status code
       via  c5857f1 s3:tests: Skip smbd error test if we do not log to stdout
      from  e01d7d9 Replace NT_STATUS_HAVE_NO_MEMORY macro

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ffb836f3feb25861ab3fadc42b0fc2603468015c
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Mar 2 11:01:33 2018 +0100

    selftest: Impove test names for samba.wbinfo_simple
    
    This simplifies selecting a specific test to run.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlet <abartlet at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Sat Mar  3 05:19:38 CET 2018 on sn-devel-144

commit 782358a7621840a2e4a8d6b93e35dbbc279f8433
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Mar 1 10:54:52 2018 +0100

    testprogs: Return the correct error status code
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlet <abartlet at samba.org>

commit c5857f10020db35fee051485b96dfc7d579e7ed5
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Mar 1 10:26:56 2018 +0100

    s3:tests: Skip smbd error test if we do not log to stdout
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlet <abartlet at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 selftest/knownfail                      | 20 ++++++++++----------
 source3/script/tests/test_smbd_error.sh | 10 ++++++++++
 source4/selftest/tests.py               |  2 +-
 testprogs/blackbox/common_test_fns.inc  |  3 +++
 4 files changed, 24 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/knownfail b/selftest/knownfail
index 710fd33..a2aeed2 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -220,16 +220,16 @@
 ^samba.blackbox.wbinfo\(ad_member:local\).wbinfo -G against ad_member
 ^samba.blackbox.wbinfo\(ad_member:local\).wbinfo -U check for sane mapping
 ^samba.blackbox.wbinfo\(ad_member:local\).wbinfo -G check for sane mapping
-^samba.wbinfo_simple.\(ad_dc_ntvfs:local\).--allocate-uid
-^samba.wbinfo_simple.\(ad_dc_ntvfs:local\).--allocate-gid
-^samba.wbinfo_simple.\(s4member:local\).--allocate-uid
-^samba.wbinfo_simple.\(s4member:local\).--allocate-gid
-^samba.wbinfo_simple.\(ad_dc:local\).--allocate-uid
-^samba.wbinfo_simple.\(ad_dc:local\).--allocate-gid
-^samba.wbinfo_simple.\(chgdcpass:local\).--allocate-uid
-^samba.wbinfo_simple.\(chgdcpass:local\).--allocate-gid
-^samba.wbinfo_simple.\(rodc:local\).--allocate-uid
-^samba.wbinfo_simple.\(rodc:local\).--allocate-gid
+^samba.wbinfo_simple.allocate-uid.wbinfo\(ad_dc_ntvfs:local\)
+^samba.wbinfo_simple.allocate-gid.wbinfo\(ad_dc_ntvfs:local\)
+^samba.wbinfo_simple.allocate-uid.wbinfo\(s4member:local\)
+^samba.wbinfo_simple.allocate-gid.wbinfo\(s4member:local\)
+^samba.wbinfo_simple.allocate-uid.wbinfo\(ad_dc:local\)
+^samba.wbinfo_simple.allocate-gid.wbinfo\(ad_dc:local\)
+^samba.wbinfo_simple.allocate-uid.wbinfo\(chgdcpass:local\)
+^samba.wbinfo_simple.allocate-gid.wbinfo\(chgdcpass:local\)
+^samba.wbinfo_simple.allocate-uid.wbinfo\(rodc:local\)
+^samba.wbinfo_simple.allocate-gid.wbinfo\(rodc:local\)
 #
 # These do not work against winbindd in member mode for unknown reasons
 #
diff --git a/source3/script/tests/test_smbd_error.sh b/source3/script/tests/test_smbd_error.sh
index e9af47a..e93dff2 100755
--- a/source3/script/tests/test_smbd_error.sh
+++ b/source3/script/tests/test_smbd_error.sh
@@ -9,6 +9,16 @@
 
 . $(dirname $0)/../../../testprogs/blackbox/subunit.sh
 failed=0
+
+if [ $SMBD_DONT_LOG_STDOUT -eq 1 ]; then
+	subunit_start_test "check_panic_0"
+	subunit_skip_test "check_panic_0" <<EOF
+logging to stdout disabled
+EOF
+
+	testok $0 $failed
+fi
+
 error_inject_conf=$(dirname $SMB_CONF_PATH)/error_inject.conf
 
 panic_count_0=$(grep -c PANIC $SMBD_TEST_LOG)
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 4e397a8..ef752a5 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -523,7 +523,7 @@ for env in ["nt4_dc", "nt4_member", "ad_dc", "ad_member", "s4member", "chgdcpass
              "--allocate-gid"]
 
     for t in tests:
-        plantestsuite("samba.wbinfo_simple.(%s:local).%s" % (env, t), "%s:local" % env, [os.path.join(srcdir(), "nsswitch/tests/test_wbinfo_simple.sh"), t])
+        plantestsuite("samba.wbinfo_simple.%s" % (t.replace(" --", ".").replace("--", "")), "%s:local" % env, [os.path.join(srcdir(), "nsswitch/tests/test_wbinfo_simple.sh"), t])
 
     plantestsuite(
         "samba.wbinfo_sids2xids.(%s:local)" % env, "%s:local" % env,
diff --git a/testprogs/blackbox/common_test_fns.inc b/testprogs/blackbox/common_test_fns.inc
index 8d755a4..a5611c6 100755
--- a/testprogs/blackbox/common_test_fns.inc
+++ b/testprogs/blackbox/common_test_fns.inc
@@ -99,8 +99,11 @@ kerberos_kinit() {
 		kpassfile=$(mktemp)
 		echo $password > ${kpassfile}
 		$kinit_tool --password-file=${kpassfile} $principal $@
+		status=$?
 		rm -f ${kpassfile}
 	else
 		echo $password | $kinit_tool $principal $@
+		status=$?
 	fi
+	return $status
 }


-- 
Samba Shared Repository