[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  bbf6221 selftest: do not run doc tests if we don't build manpages
       via  fffbdf0 selftest: Output error when samba_tool user command fails
       via  1160b69 configure: print a message when docbook.xsl is missing localy
      from  99c95fc libsmb: call directly tevent_req_simple_finish_ntstatus

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


- Log -----------------------------------------------------------------
commit bbf62213efb0b77388aff1f5feb852414e1128a2
Author: Matthieu Patou <mat at matws.net>
Date:   Sun May 5 15:37:58 2013 -0700

    selftest: do not run doc tests if we don't build manpages
    
    if XSLTPROC_MANPAGES is not set then manpages won't be built so there is
    no sense trying to test it.
    Signed-off-by: Matthieu Patou <mat at matws.net>
    
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Mon May  6 12:53:37 CEST 2013 on sn-devel-104

commit fffbdf01fa6a74e6da70815607a1c22b9b6ebcdb
Author: Matthieu Patou <mat at matws.net>
Date:   Sun May 5 15:37:00 2013 -0700

    selftest: Output error when samba_tool user command fails
    
    It should help to debug why is it failing on some hosts in the build
    farm (ie. sn-devel)
    Signed-off-by: Matthieu Patou <mat at matws.net>
    
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit 1160b699cb73cc466163504ebb7299912f10cd9b
Author: Matthieu Patou <mat at matws.net>
Date:   Sun May 5 15:05:37 2013 -0700

    configure: print a message when docbook.xsl is missing localy
    
    Signed-off-by: Matthieu Patou <mat at matws.net>
    
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

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

Summary of changes:
 buildtools/wafsamba/samba_conftests.py |    3 +++
 python/samba/tests/samba_tool/user.py  |    6 ++++--
 selftest/tests.py                      |   16 +++++++++++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_conftests.py b/buildtools/wafsamba/samba_conftests.py
index 0274f66..ec98ba0 100644
--- a/buildtools/wafsamba/samba_conftests.py
+++ b/buildtools/wafsamba/samba_conftests.py
@@ -503,3 +503,6 @@ def CHECK_XSLTPROC_MANPAGES(conf):
                              msg='Checking for stylesheet %s' % s,
                              define='XSLTPROC_MANPAGES', on_target=False,
                              boolean=True)
+    if not conf.CONFIG_SET('XSLTPROC_MANPAGES'):
+        print "A local copy of the docbook.xsl wasn't found on your system" \
+              " consider installing package like docbook-xsl"
diff --git a/python/samba/tests/samba_tool/user.py b/python/samba/tests/samba_tool/user.py
index 33344cd..89fa22b 100644
--- a/python/samba/tests/samba_tool/user.py
+++ b/python/samba/tests/samba_tool/user.py
@@ -232,7 +232,8 @@ class UserCmdTestCase(SambaToolCmdTest):
                                                 "-H", "ldap://%s" % os.environ["DC_SERVER"],
                                                 "-U%s%%%s" % (os.environ["DC_USERNAME"], os.environ["DC_PASSWORD"]))
 
-        self.assertCmdSuccess(result)
+        msg = "command should return %s" % err
+        self.assertCmdSuccess(result, msg)
         self.assertEquals(err,"","Shouldn't be any error messages")
         self.assertIn("User '%s' created successfully" % user["name"], out)
 
@@ -261,7 +262,8 @@ class UserCmdTestCase(SambaToolCmdTest):
                                                 "-H", "ldap://%s" % os.environ["DC_SERVER"],
                                                 "-U%s%%%s" % (os.environ["DC_USERNAME"], os.environ["DC_PASSWORD"]))
 
-        self.assertCmdSuccess(result)
+        msg = "command should return %s" % err
+        self.assertCmdSuccess(result, msg)
         self.assertEquals(err,"","Shouldn't be any error messages")
         self.assertIn("User '%s' created successfully" % user["name"], out)
 
diff --git a/selftest/tests.py b/selftest/tests.py
index 9a59e9d..aebfc57 100644
--- a/selftest/tests.py
+++ b/selftest/tests.py
@@ -20,8 +20,22 @@
 
 from selftesthelpers import *
 
+try:
+    config_h = os.environ["CONFIG_H"]
+except KeyError:
+    config_h = os.path.join(samba4bindir, "default/include/config.h")
+
+# define here var to check what we support
+f = open(config_h, 'r')
+try:
+    have_man_pages_support = ("XSLTPROC_MANPAGES 1" in f.read())
+finally:
+    f.close()
+
 planpythontestsuite("none", "samba.tests.source")
-planpythontestsuite("none", "samba.tests.docs")
+if have_man_pages_support:
+    planpythontestsuite("none", "samba.tests.docs")
+
 planpythontestsuite("none", "selftest.tests.test_suite", extra_path=[srcdir()])
 planpythontestsuite("none", "subunit")
 planpythontestsuite("none", "samba.tests.blackbox.ndrdump")


-- 
Samba Shared Repository