[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Thu Mar 13 16:50:04 MDT 2014
The branch, master has been updated
via 3632c59 selftest/subunithelper.py: correctly pass testsuite-uxsuccess to end_testsuite()
via fee156f selftest/subunithelper.py: correctly handle fail_immediately in end_testsuite of FilterOps
via 1424695 selftest/subunithelper.py: correctly handle unexpected success in FilterOps
via ab9f021 script/autobuild: use --force-rebase option
via f164e81 lib/popt: Patch memory leak in popthelp.c
via 2dc799b lib/popt: Small whitespace fix for readability.
from 2b44c85 s3-libads: Use the IP instead of the name.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3632c59e250396b3974bccf7ad74cbe5c84fdba3
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Mar 12 15:12:42 2014 +0100
selftest/subunithelper.py: correctly pass testsuite-uxsuccess to end_testsuite()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Thu Mar 13 23:49:36 CET 2014 on sn-devel-104
commit fee156f5b9235b5f766cb773433ddb7d0ccd98a1
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Mar 12 15:12:42 2014 +0100
selftest/subunithelper.py: correctly handle fail_immediately in end_testsuite of FilterOps
This way --fail-immediately also works if a command segfaults.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 14246953b2e91578e5f51faedfdf31926a5b1950
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Mar 12 15:12:42 2014 +0100
selftest/subunithelper.py: correctly handle unexpected success in FilterOps
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit ab9f02193188af8e482052ee6b55c30aac2c8340
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 17 09:15:30 2014 +0100
script/autobuild: use --force-rebase option
This makes sure the current user will be the committer.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit f164e81e8b268ccab6c51c966b569dd06106caa2
Author: Jose A. Rivera <jarrpa at redhat.com>
Date: Mon Mar 3 11:52:46 2014 +0530
lib/popt: Patch memory leak in popthelp.c
Memory created as "t" was not being free'd.
Change-Id: I5f6e20acc6c440a1cd9908aed7a90de2000f22f8
Coverity-Id: 240599
Coverity-Id: 240600
Signed-off-by: Jose A. Rivera <jarrpa at redhat.com>
Reviewed-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ira Cooper <ira at samba.org>
commit 2dc799bccdca00f0f2da2727ee22d1c3f6f563ce
Author: Jose A. Rivera <jarrpa at redhat.com>
Date: Mon Mar 3 11:49:55 2014 +0530
lib/popt: Small whitespace fix for readability.
Change-Id: Ib920f7e84c0247a8f09aa4c79c65b26afb78f234
Signed-off-by: Jose A. Rivera <jarrpa at redhat.com>
Reviewed-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ira Cooper <ira at samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/popt/popthelp.c | 31 ++++++++++++++++---------------
script/autobuild.py | 4 ++--
selftest/subunithelper.py | 25 +++++++++++++++++++++++--
3 files changed, 41 insertions(+), 19 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/popt/popthelp.c b/lib/popt/popthelp.c
index e965ff6..4e2a1a5 100644
--- a/lib/popt/popthelp.c
+++ b/lib/popt/popthelp.c
@@ -240,22 +240,23 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
/* Choose type of output */
/*@-branchstate@*/
if (opt->argInfo & POPT_ARGFLAG_SHOW_DEFAULT) {
- defs = singleOptionDefaultValue(lineLength, opt, translation_domain);
- if (defs) {
- char * t = (char *)malloc((help ? strlen(help) : 0) +
+ defs = singleOptionDefaultValue(lineLength, opt, translation_domain);
+ if (defs) {
+ char * t = (char *)malloc((help ? strlen(help) : 0) +
strlen(defs) + sizeof(" "));
- if (t) {
- char * te = t;
- *te = '\0';
- if (help) {
- strcpy(te, help); te += strlen(te);
- }
- *te++ = ' ';
- strcpy(te, defs);
- defs = (char *)_free(defs);
+ if (t) {
+ char * te = t;
+ *te = '\0';
+ if (help) {
+ strcpy(te, help);
+ te += strlen(te);
+ }
+ *te++ = ' ';
+ strcpy(te, defs);
+ }
+ defs = (char *)_free(defs);
+ defs = t;
}
- defs = t;
- }
}
/*@=branchstate@*/
@@ -325,7 +326,7 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
left = (char *)_free(left);
if (defs) {
- help = defs; defs = NULL;
+ help = defs;
}
helpLength = strlen(help);
diff --git a/script/autobuild.py b/script/autobuild.py
index 4fd6ee4..afd8d3d 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -413,11 +413,11 @@ def rebase_tree(rebase_url, rebase_branch = "master"):
show=True, dir=test_master)
run_cmd("git fetch %s" % rebase_remote, show=True, dir=test_master)
if options.fix_whitespace:
- run_cmd("git rebase --whitespace=fix %s/%s" %
+ run_cmd("git rebase --force-rebase --whitespace=fix %s/%s" %
(rebase_remote, rebase_branch),
show=True, dir=test_master)
else:
- run_cmd("git rebase %s/%s" %
+ run_cmd("git rebase --force-rebase %s/%s" %
(rebase_remote, rebase_branch),
show=True, dir=test_master)
diff = run_cmd("git --no-pager diff HEAD %s/%s" %
diff --git a/selftest/subunithelper.py b/selftest/subunithelper.py
index 057e139..6f1fdce 100644
--- a/selftest/subunithelper.py
+++ b/selftest/subunithelper.py
@@ -24,7 +24,7 @@ import subunit.iso8601
import testtools
from testtools import content, content_type
-VALID_RESULTS = ['success', 'successful', 'failure', 'fail', 'skip', 'knownfail', 'error', 'xfail', 'skip-testsuite', 'testsuite-failure', 'testsuite-xfail', 'testsuite-success', 'testsuite-error', 'uxsuccess']
+VALID_RESULTS = ['success', 'successful', 'failure', 'fail', 'skip', 'knownfail', 'error', 'xfail', 'skip-testsuite', 'testsuite-failure', 'testsuite-xfail', 'testsuite-success', 'testsuite-error', 'uxsuccess', 'testsuite-uxsuccess']
class TestsuiteEnabledTestResult(testtools.testresult.TestResult):
@@ -158,6 +158,9 @@ def parse_results(msg_ops, statistics, fh):
exitcode = 1
elif result == "testsuite-xfail":
msg_ops.end_testsuite(testname, "xfail", reason)
+ elif result == "testsuite-uxsuccess":
+ msg_ops.end_testsuite(testname, "uxsuccess", reason)
+ exitcode = 1
elif result == "testsuite-error":
msg_ops.end_testsuite(testname, "error", reason)
exitcode = 1
@@ -301,8 +304,14 @@ class FilterOps(testtools.testresult.TestResult):
def addUnexpectedSuccess(self, test, details=None):
test = self._add_prefix(test)
+ self.uxsuccess_added+=1
+ self.total_uxsuccess+=1
self._ops.addUnexpectedSuccess(test, details)
+ if self.output:
+ self._ops.output_msg(self.output)
self.output = None
+ if self.fail_immediately:
+ raise ImmediateFail()
def addFailure(self, test, details=None):
test = self._add_prefix(test)
@@ -362,12 +371,18 @@ class FilterOps(testtools.testresult.TestResult):
if self.xfail_added > 0:
xfail = True
- if self.fail_added > 0 or self.error_added > 0:
+ if self.fail_added > 0 or self.error_added > 0 or self.uxsuccess_added > 0:
xfail = False
if xfail and result in ("fail", "failure"):
result = "xfail"
+ if self.uxsuccess_added > 0 and result != "uxsuccess":
+ result = "uxsuccess"
+ if reason is None:
+ reason = "Subunit/Filter Reason"
+ reason += "\n uxsuccess[%d]" % self.uxsuccess_added
+
if self.fail_added > 0 and result != "failure":
result = "failure"
if reason is None:
@@ -381,6 +396,12 @@ class FilterOps(testtools.testresult.TestResult):
reason += "\n errors[%d]" % self.error_added
self._ops.end_testsuite(name, result, reason)
+ if result not in ("success", "xfail"):
+ if self.output:
+ self._ops.output_msg(self.output)
+ if self.fail_immediately:
+ raise ImmediateFail()
+ self.output = None
def __init__(self, out, prefix=None, suffix=None, expected_failures=None,
strip_ok_output=False, fail_immediately=False,
--
Samba Shared Repository
More information about the samba-cvs
mailing list