The branch, master has been updated via b65c8d0... s4: Fix more test results to not conflict with subunit commands. via 5d0694f... subunit: Cope with lowercase test results in tap2subunit. via 3a34b5f... subunit: Remove more test output that could be interpreted by subunit. via 7da94cc... subunit: Support formatting compatible with upstream subunit, for consistency. via d0ab744... selftest: Accept 'testing:' to introduce new tests. from 0ee1985... [Bug 7345] Incomplete description of function return values in libsmbclient.h
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit b65c8d05059466f8e8b2196c99469105afd128e8 Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Apr 11 20:56:48 2010 +0200 s4: Fix more test results to not conflict with subunit commands. commit 5d0694f9941e22f92c9c641b8fb3a7ce376ee5cd Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Apr 11 20:56:02 2010 +0200 subunit: Cope with lowercase test results in tap2subunit. Also submitted upstream. commit 3a34b5f35ec0a666ff8f731577bd2fdfa67e9dcb Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Apr 11 16:55:48 2010 +0200 subunit: Remove more test output that could be interpreted by subunit. commit 7da94cc4a664521be279b019e9f32121cd410193 Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Apr 11 01:39:06 2010 +0200 subunit: Support formatting compatible with upstream subunit, for consistency. Upstream subunit makes a ":" after commands optional, so I've fixed any places where we might trigger commands accidently. I've filed a bug about this in subunit. commit d0ab7440acf57f698290c2ba64650c6144bc8545 Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Apr 11 00:08:16 2010 +0200 selftest: Accept 'testing:' to introduce new tests. ----------------------------------------------------------------------- Summary of changes: lib/subunit/python/subunit/__init__.py | 6 +- .../python/subunit/tests/test_tap2subunit.py | 15 +++- lib/tdb/tools/tdbtorture.c | 2 +- selftest/subunithelper.py | 32 ++++--- source4/dsdb/kcc/kcc_topology.c | 2 +- .../samdb/ldb_modules/tests/possibleinferiors.py | 2 +- source4/lib/ldb/tests/test-generic.sh | 2 +- source4/lib/ldb/tools/ldbtest.c | 2 +- source4/torture/basic/base.c | 74 ++++++++-------- source4/torture/basic/denytest.c | 4 +- source4/torture/basic/misc.c | 2 +- source4/torture/basic/unlink.c | 2 +- source4/torture/libnet/libnet_share.c | 2 +- source4/torture/libnetapi/libnetapi_group.c | 18 ++-- source4/torture/libnetapi/libnetapi_user.c | 18 ++-- source4/torture/locktest.c | 2 +- source4/torture/locktest2.c | 2 +- source4/torture/raw/acls.c | 14 ++-- source4/torture/raw/chkpath.c | 10 +- source4/torture/raw/close.c | 8 +- source4/torture/raw/composite.c | 13 ++-- source4/torture/raw/lock.c | 26 +++--- source4/torture/raw/lookuprate.c | 2 +- source4/torture/raw/mkdir.c | 14 ++-- source4/torture/raw/mux.c | 4 +- source4/torture/raw/notify.c | 92 ++++++++++---------- source4/torture/raw/search.c | 2 +- source4/torture/raw/setfileinfo.c | 26 +++--- source4/torture/rpc/alter_context.c | 6 +- source4/torture/rpc/drsuapi.c | 16 ++-- source4/torture/rpc/drsuapi_cracknames.c | 12 ++-- source4/torture/rpc/dsgetinfo.c | 2 +- source4/torture/rpc/dssync.c | 2 +- source4/torture/rpc/lsa.c | 2 +- source4/torture/rpc/netlogon.c | 2 +- source4/torture/rpc/samba3rpc.c | 4 +- source4/torture/rpc/samlogon.c | 2 +- source4/torture/rpc/samr.c | 34 ++++---- source4/torture/rpc/samr_accessmask.c | 30 +++--- source4/torture/rpc/spoolss.c | 2 +- source4/torture/rpc/srvsvc.c | 36 ++++---- source4/torture/rpc/wkssvc.c | 58 ++++++------ source4/torture/smb2/acls.c | 10 +- source4/torture/smb2/create.c | 18 ++-- source4/torture/smb2/dir.c | 2 +- source4/torture/smb2/notify.c | 78 ++++++++-------- source4/torture/smb2/setinfo.c | 14 ++-- 47 files changed, 373 insertions(+), 355 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/subunit/python/subunit/__init__.py b/lib/subunit/python/subunit/__init__.py index 6b65ae4..4b25ca3 100644 --- a/lib/subunit/python/subunit/__init__.py +++ b/lib/subunit/python/subunit/__init__.py @@ -913,7 +913,7 @@ def TAP2SubUnit(tap, subunit): subunit.write("]\n") continue # not a plan line, or have seen one before - match = re.match("(ok|not ok)(?:\s+(\d+)?)?(?:\s+([^#]*[^#\s]+)\s*)?(?:\s+#\s+(TODO|SKIP)(?:\s+(.*))?)?\n", line) + match = re.match("(ok|not ok)(?:\s+(\d+)?)?(?:\s+([^#]*[^#\s]+)\s*)?(?:\s+#\s+(TODO|SKIP|skip|todo)(?:\s+(.*))?)?\n", line) if match: # new test, emit current one. _emit_test() @@ -927,9 +927,9 @@ def TAP2SubUnit(tap, subunit): else: description = ' ' + description if directive is not None: - if directive == 'TODO': + if directive.upper() == 'TODO': result = 'xfail' - elif directive == 'SKIP': + elif directive.upper() == 'SKIP': result = 'skip' if directive_comment is not None: log.append(directive_comment) diff --git a/lib/subunit/python/subunit/tests/test_tap2subunit.py b/lib/subunit/python/subunit/tests/test_tap2subunit.py index febfe9d..c4ca4cd 100644 --- a/lib/subunit/python/subunit/tests/test_tap2subunit.py +++ b/lib/subunit/python/subunit/tests/test_tap2subunit.py @@ -18,9 +18,7 @@ import unittest from StringIO import StringIO -import os import subunit -import sys class TestTAP2SubUnit(unittest.TestCase): @@ -125,6 +123,19 @@ class TestTAP2SubUnit(unittest.TestCase): ], self.subunit.getvalue().splitlines()) + def test_ok_skip_number_comment_lowercase(self): + self.tap.write("ok 1 # skip no samba environment available, skipping compilation\n") + self.tap.seek(0) + result = subunit.TAP2SubUnit(self.tap, self.subunit) + self.assertEqual(0, result) + self.assertEqual([ + "test test 1", + "skip test 1 [", + "no samba environment available, skipping compilation", + "]" + ], + self.subunit.getvalue().splitlines()) + def test_ok_number_description_SKIP_skip_comment(self): # A file # ok 1 foo # SKIP Not done yet diff --git a/lib/tdb/tools/tdbtorture.c b/lib/tdb/tools/tdbtorture.c index eda79f8..79fe3cd 100644 --- a/lib/tdb/tools/tdbtorture.c +++ b/lib/tdb/tools/tdbtorture.c @@ -333,7 +333,7 @@ int main(int argc, char * const *argv) if ((pids[i]=fork()) == 0) { close(pfds[0]); if (i == 0) { - printf("testing with %d processes, %d loops, %d hash_size, seed=%d%s\n", + printf("Testing with %d processes, %d loops, %d hash_size, seed=%d%s\n", num_procs, num_loops, hash_size, seed, always_transaction ? " (all within transactions)" : ""); } exit(run_child(i, seed, num_loops, 0)); diff --git a/selftest/subunithelper.py b/selftest/subunithelper.py index 545178e..d03a1d0 100644 --- a/selftest/subunithelper.py +++ b/selftest/subunithelper.py @@ -32,19 +32,25 @@ def parse_results(msg_ops, statistics, fh): l = fh.readline() if l == "": break - if l.startswith("test: "): + parts = l.split(None, 1) + if not len(parts) == 2 or not l.startswith(parts[0]): + continue + command = parts[0].rstrip(":") + arg = parts[1] + if command in ("test", "testing"): + msg_ops.control_msg(l) + msg_ops.start_test(arg.rstrip()) + open_tests.append(arg.rstrip()) + elif command == "time": msg_ops.control_msg(l) - name = l.split(":", 1)[1].strip() - msg_ops.start_test(name) - open_tests.append(name) - elif l.startswith("time: "): grp = re.match( - "^time: (\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)\n", l) + "(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)\n", arg) msg_ops.report_time(time.mktime((int(grp.group(1)), int(grp.group(2)), int(grp.group(3)), int(grp.group(4)), int(grp.group(5)), int(grp.group(6)), 0, 0, 0))) - elif re.match("^(" + "|".join(VALID_RESULTS) + "): (.*?)( \[)?([ \t]*)( multipart)?\n", l): + elif command in VALID_RESULTS: msg_ops.control_msg(l) - grp = re.match("^(" + "|".join(VALID_RESULTS) + "): (.*?)( \[)?([ \t]*)( multipart)?\n", l) - (result, testname, hasreason) = (grp.group(1), grp.group(2), grp.group(3)) + result = command + grp = re.match("(.*?)( \[)?([ \t]*)( multipart)?\n", arg) + (testname, hasreason) = (grp.group(1), grp.group(2)) if hasreason: reason = "" # reason may be specified in next lines @@ -122,10 +128,10 @@ def parse_results(msg_ops, statistics, fh): msg_ops.end_testsuite(testname, "xfail", reason) elif result == "testsuite-error": msg_ops.end_testsuite(testname, "error", reason) - elif l.startswith("testsuite: "): - msg_ops.start_testsuite(l.split(":", 1)[1].strip()) - elif l.startswith("progress: "): - arg = l.split(":", 1)[1].strip() + elif command == "testsuite": + msg_ops.start_testsuite(arg.strip()) + elif command == "progress": + arg = arg.strip() if arg == "pop": msg_ops.progress(None, subunit.PROGRESS_POP) elif arg == "push": diff --git a/source4/dsdb/kcc/kcc_topology.c b/source4/dsdb/kcc/kcc_topology.c index 3530d0e..0b251b7 100644 --- a/source4/dsdb/kcc/kcc_topology.c +++ b/source4/dsdb/kcc/kcc_topology.c @@ -3464,7 +3464,7 @@ NTSTATUS kcctpl_test(struct ldb_context *ldb) struct GUID_list keep; bool all_connected; - DEBUG(0, ("testing kcctpl_create_intersite_connections\n")); + DEBUG(0, ("Testing kcctpl_create_intersite_connections\n")); status = kcctpl_create_intersite_connections(ldb, tmp_ctx, &keep, &all_connected); DEBUG(4, ("%s\n", nt_errstr(status))); diff --git a/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py b/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py index 67918d6..d797679 100755 --- a/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py +++ b/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py @@ -217,7 +217,7 @@ def possible_inferiors_constructed(db, classinfo, c): def test_class(db, classinfo, oc): """test to see if one objectclass returns the correct possibleInferiors""" - print "testing objectClass %s" % oc + print "Testing objectClass %s" % oc poss1 = possible_inferiors_search(db, oc) poss2 = possible_inferiors_constructed(db, classinfo, oc) if poss1 != poss2: diff --git a/source4/lib/ldb/tests/test-generic.sh b/source4/lib/ldb/tests/test-generic.sh index fec4b5b..c8645a5 100755 --- a/source4/lib/ldb/tests/test-generic.sh +++ b/source4/lib/ldb/tests/test-generic.sh @@ -44,7 +44,7 @@ $VALGRIND ldbadd$EXEEXT $LDBDIR/tests/test-wrong_attributes.ldif && { exit 1 } -echo "testing indexed search" +echo "Testing indexed search" $VALGRIND ldbsearch$EXEEXT '(uid=uham)' || exit 1 $VALGRIND ldbsearch$EXEEXT '(&(objectclass=person)(objectclass=person)(objectclass=top))' || exit 1 $VALGRIND ldbsearch$EXEEXT '(&(uid=uham)(uid=uham))' || exit 1 diff --git a/source4/lib/ldb/tools/ldbtest.c b/source4/lib/ldb/tools/ldbtest.c index 1c877c7..077eb98 100644 --- a/source4/lib/ldb/tools/ldbtest.c +++ b/source4/lib/ldb/tools/ldbtest.c @@ -241,7 +241,7 @@ static void search_uid(struct ldb_context *ldb, struct ldb_dn *basedn, exit(1); } - printf("testing uid %d/%d - %d \r", i, uid, res->count); + printf("Testing uid %d/%d - %d \r", i, uid, res->count); fflush(stdout); talloc_free(res); diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c index e4b4c62..309a394 100644 --- a/source4/torture/basic/base.c +++ b/source4/torture/basic/base.c @@ -930,7 +930,7 @@ error_test3: smbcli_unlink(cli1->tree, fname); - torture_comment(tctx, "testing ctemp\n"); + torture_comment(tctx, "Testing ctemp\n"); fnum1 = smbcli_ctemp(cli1->tree, "\\", &tmp_path); if (fnum1 == -1) { torture_comment(tctx, "ctemp failed (%s)\n", smbcli_errstr(cli1->tree)); @@ -950,13 +950,13 @@ error_test4: smbcli_setatr(cli2->tree, fname, 0, 0); smbcli_unlink(cli2->tree, fname); - torture_comment(tctx, "TEST #1 testing 2 non-io opens (no delete)\n"); + torture_comment(tctx, "Test #1 testing 2 non-io opens (no delete)\n"); fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, SEC_FILE_READ_ATTRIBUTE, FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { - torture_comment(tctx, "test 1 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); + torture_comment(tctx, "Test 1 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); CHECK_MAX_FAILURES(error_test10); return false; } @@ -964,17 +964,17 @@ error_test4: fnum2 = smbcli_nt_create_full(cli2->tree, fname, 0, SEC_FILE_READ_ATTRIBUTE, FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OPEN_IF, 0, 0); if (fnum2 == -1) { - torture_comment(tctx, "test 1 open 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); + torture_comment(tctx, "Test 1 open 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); CHECK_MAX_FAILURES(error_test10); return false; } if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) { - torture_comment(tctx, "test 1 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); + torture_comment(tctx, "Test 1 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); return false; } if (NT_STATUS_IS_ERR(smbcli_close(cli2->tree, fnum2))) { - torture_comment(tctx, "test 1 close 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); + torture_comment(tctx, "Test 1 close 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); return false; } @@ -982,13 +982,13 @@ error_test4: error_test10: smbcli_unlink(cli1->tree, fname); - torture_comment(tctx, "TEST #2 testing 2 non-io opens (first with delete)\n"); + torture_comment(tctx, "Test #2 testing 2 non-io opens (first with delete)\n"); fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, SEC_STD_DELETE|SEC_FILE_READ_ATTRIBUTE, FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { - torture_comment(tctx, "test 2 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); + torture_comment(tctx, "Test 2 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); CHECK_MAX_FAILURES(error_test20); return false; } @@ -997,17 +997,17 @@ error_test10: NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OPEN_IF, 0, 0); if (fnum2 == -1) { - torture_comment(tctx, "test 2 open 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); + torture_comment(tctx, "Test 2 open 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); CHECK_MAX_FAILURES(error_test20); return false; } if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) { - torture_comment(tctx, "test 1 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); + torture_comment(tctx, "Test 1 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); return false; } if (NT_STATUS_IS_ERR(smbcli_close(cli2->tree, fnum2))) { - torture_comment(tctx, "test 1 close 2 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); + torture_comment(tctx, "Test 1 close 2 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); return false; } @@ -1015,13 +1015,13 @@ error_test10: error_test20: smbcli_unlink(cli1->tree, fname); - torture_comment(tctx, "TEST #3 testing 2 non-io opens (second with delete)\n"); + torture_comment(tctx, "Test #3 testing 2 non-io opens (second with delete)\n"); fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, SEC_FILE_READ_ATTRIBUTE, FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { - torture_comment(tctx, "test 3 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); + torture_comment(tctx, "Test 3 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); CHECK_MAX_FAILURES(error_test30); return false; } @@ -1030,17 +1030,17 @@ error_test20: NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OPEN_IF, 0, 0); if (fnum2 == -1) { - torture_comment(tctx, "test 3 open 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); + torture_comment(tctx, "Test 3 open 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); CHECK_MAX_FAILURES(error_test30); return false; } if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) { - torture_comment(tctx, "test 3 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); + torture_comment(tctx, "Test 3 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); return false; } if (NT_STATUS_IS_ERR(smbcli_close(cli2->tree, fnum2))) { - torture_comment(tctx, "test 3 close 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); + torture_comment(tctx, "Test 3 close 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); return false; } @@ -1048,13 +1048,13 @@ error_test20: error_test30: smbcli_unlink(cli1->tree, fname); - torture_comment(tctx, "TEST #4 testing 2 non-io opens (both with delete)\n"); + torture_comment(tctx, "Test #4 testing 2 non-io opens (both with delete)\n"); fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, SEC_STD_DELETE|SEC_FILE_READ_ATTRIBUTE, FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { - torture_comment(tctx, "test 4 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); + torture_comment(tctx, "Test 4 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); CHECK_MAX_FAILURES(error_test40); return false; } @@ -1063,15 +1063,15 @@ error_test30: NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OPEN_IF, 0, 0); if (fnum2 != -1) { - torture_comment(tctx, "test 4 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, smbcli_errstr(cli2->tree)); + torture_comment(tctx, "Test 4 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, smbcli_errstr(cli2->tree)); CHECK_MAX_FAILURES(error_test40); return false; } - torture_comment(tctx, "test 4 open 2 of %s gave %s (correct error should be %s)\n", fname, smbcli_errstr(cli2->tree), "sharing violation"); + torture_comment(tctx, "Test 4 open 2 of %s gave %s (correct error should be %s)\n", fname, smbcli_errstr(cli2->tree), "sharing violation"); if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) { - torture_comment(tctx, "test 4 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); + torture_comment(tctx, "Test 4 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); return false; } @@ -1079,13 +1079,13 @@ error_test30: error_test40: smbcli_unlink(cli1->tree, fname); - torture_comment(tctx, "TEST #5 testing 2 non-io opens (both with delete - both with file share delete)\n"); + torture_comment(tctx, "Test #5 testing 2 non-io opens (both with delete - both with file share delete)\n"); fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, SEC_STD_DELETE|SEC_FILE_READ_ATTRIBUTE, FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { - torture_comment(tctx, "test 5 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); + torture_comment(tctx, "Test 5 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); CHECK_MAX_FAILURES(error_test50); return false; } @@ -1094,24 +1094,24 @@ error_test40: NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OPEN_IF, 0, 0); if (fnum2 == -1) { - torture_comment(tctx, "test 5 open 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); + torture_comment(tctx, "Test 5 open 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); CHECK_MAX_FAILURES(error_test50); return false; } if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) { - torture_comment(tctx, "test 5 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); + torture_comment(tctx, "Test 5 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); return false; } if (NT_STATUS_IS_ERR(smbcli_close(cli2->tree, fnum2))) { - torture_comment(tctx, "test 5 close 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); + torture_comment(tctx, "Test 5 close 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); return false; } torture_comment(tctx, "non-io open test #5 passed.\n"); error_test50: - torture_comment(tctx, "TEST #6 testing 1 non-io open, one io open\n"); + torture_comment(tctx, "Test #6 testing 1 non-io open, one io open\n"); smbcli_unlink(cli1->tree, fname); @@ -1119,7 +1119,7 @@ error_test50: NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { - torture_comment(tctx, "test 6 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); + torture_comment(tctx, "Test 6 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); CHECK_MAX_FAILURES(error_test60); return false; } @@ -1128,24 +1128,24 @@ error_test50: NTCREATEX_SHARE_ACCESS_READ, NTCREATEX_DISP_OPEN_IF, 0, 0); if (fnum2 == -1) { - torture_comment(tctx, "test 6 open 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); + torture_comment(tctx, "Test 6 open 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); CHECK_MAX_FAILURES(error_test60); return false; } if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) { - torture_comment(tctx, "test 6 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); + torture_comment(tctx, "Test 6 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); return false; } if (NT_STATUS_IS_ERR(smbcli_close(cli2->tree, fnum2))) { - torture_comment(tctx, "test 6 close 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); + torture_comment(tctx, "Test 6 close 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); return false; } torture_comment(tctx, "non-io open test #6 passed.\n"); error_test60: - torture_comment(tctx, "TEST #7 testing 1 non-io open, one io open with delete\n"); + torture_comment(tctx, "Test #7 testing 1 non-io open, one io open with delete\n"); smbcli_unlink(cli1->tree, fname); @@ -1153,7 +1153,7 @@ error_test60: NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { - torture_comment(tctx, "test 7 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); + torture_comment(tctx, "Test 7 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); CHECK_MAX_FAILURES(error_test70); return false; } @@ -1162,15 +1162,15 @@ error_test60: NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OPEN_IF, 0, 0); if (fnum2 != -1) { - torture_comment(tctx, "test 7 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, smbcli_errstr(cli2->tree)); + torture_comment(tctx, "Test 7 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, smbcli_errstr(cli2->tree)); CHECK_MAX_FAILURES(error_test70); return false; } - torture_comment(tctx, "test 7 open 2 of %s gave %s (correct error should be %s)\n", fname, smbcli_errstr(cli2->tree), "sharing violation"); + torture_comment(tctx, "Test 7 open 2 of %s gave %s (correct error should be %s)\n", fname, smbcli_errstr(cli2->tree), "sharing violation"); if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) { - torture_comment(tctx, "test 7 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); + torture_comment(tctx, "Test 7 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); return false; } @@ -1178,7 +1178,7 @@ error_test60: error_test70: - torture_comment(tctx, "TEST #8 testing one normal open, followed by lock, followed by open with truncate\n"); + torture_comment(tctx, "Test #8 testing one normal open, followed by lock, followed by open with truncate\n"); smbcli_unlink(cli1->tree, fname); diff --git a/source4/torture/basic/denytest.c b/source4/torture/basic/denytest.c index 8a5c24c..174a1b2 100644 --- a/source4/torture/basic/denytest.c +++ b/source4/torture/basic/denytest.c @@ -1429,7 +1429,7 @@ bool torture_denytest1(struct torture_context *tctx, smbcli_close(cli1->tree, fnum1); } - torture_comment(tctx, "testing %d entries\n", (int)ARRAY_SIZE(denytable1)); + torture_comment(tctx, "Testing %d entries\n", (int)ARRAY_SIZE(denytable1)); GetTimeOfDay(&tv_start); @@ -1797,7 +1797,7 @@ static bool torture_ntdenytest(struct torture_context *tctx, io1.ntcreatex.in.fname = fname; io2 = io1; - torture_comment(tctx, "testing %d entries on %s\n", torture_numops, fname); + torture_comment(tctx, "Testing %d entries on %s\n", torture_numops, fname); for (i=0;i<torture_numops;i++) { NTSTATUS status1, status2, status2_p; diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c index 2b08ad2..40a6140 100644 --- a/source4/torture/basic/misc.c +++ b/source4/torture/basic/misc.c @@ -429,7 +429,7 @@ bool torture_ioctl_test(struct torture_context *tctx, torture_comment(tctx, "ioctl job info: %s\n", smbcli_errstr(cli->tree)); for (device=0;device<0x100;device++) { - torture_comment(tctx, "testing device=0x%x\n", device); + torture_comment(tctx, "Testing device=0x%x\n", device); for (function=0;function<0x100;function++) { parms.ioctl.in.request = (device << 16) | function; status = smb_raw_ioctl(cli->tree, mem_ctx, &parms); diff --git a/source4/torture/basic/unlink.c b/source4/torture/basic/unlink.c index ca32d5f..45ef1c5 100644 --- a/source4/torture/basic/unlink.c +++ b/source4/torture/basic/unlink.c @@ -60,7 +60,7 @@ bool torture_unlinktest(struct torture_context *tctx, struct smbcli_state *cli) smbcli_close(cli->tree, fnum); smbcli_unlink(cli->tree, fname); -- Samba Shared Repository