[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  3d1e4a9 dsdb: fix the user_account_control test.
       via  0de85d6 selftest: Add missing variable to @exported_envvars
      from  8f312ae ctdb-tests: Add tests for "ctdb reloadips" and "ctdb recover"

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


- Log -----------------------------------------------------------------
commit 3d1e4a90d0a890a20fea6b39ae96e6a7e34d4b79
Author: Michael Adam <obnox at samba.org>
Date:   Mon Mar 16 17:22:01 2015 +0100

    dsdb: fix the user_account_control test.
    
    On my system (Fedora 21) the test fails with:
    
    [1(0)/1 at 0s] samba4.user_account_control.python(dc)
    teardown_env(dc)
    Traceback (most recent call last):
      File "/home/obnox/devel/samba/master-push.git/source4/dsdb/tests/python/user_account_control.py", line 23, in <module>
        from subunit.run import SubunitTestRunner
    ImportError: No module named subunit.run
    
    This fixes it for me.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Mon Mar 16 20:25:33 CET 2015 on sn-devel-104

commit 0de85d6eb466458886764acb3245e7241b45d189
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Mar 16 17:43:59 2015 +0100

    selftest: Add missing variable to @exported_envvars
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

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

Summary of changes:
 selftest/selftest.pl                              | 1 +
 source4/dsdb/tests/python/user_account_control.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index f08a8f9..c9b4818 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -798,6 +798,7 @@ my @exported_envvars = (
 
 	# resolv_wrapper
 	"RESOLV_WRAPPER_CONF",
+	"RESOLV_WRAPPER_HOSTS",
 );
 
 sub sighandler($)
diff --git a/source4/dsdb/tests/python/user_account_control.py b/source4/dsdb/tests/python/user_account_control.py
index 61c208b..16c7f81 100644
--- a/source4/dsdb/tests/python/user_account_control.py
+++ b/source4/dsdb/tests/python/user_account_control.py
@@ -20,7 +20,7 @@ import base64
 sys.path.insert(0, "bin/python")
 from samba.tests.subunitrun import TestProgram, SubunitOptions
 
-from subunit.run import SubunitTestRunner
+from samba.subunit.run import SubunitTestRunner
 from samba.auth import system_session
 from samba.samdb import SamDB
 from samba.dcerpc import samr, security, lsa


-- 
Samba Shared Repository