sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

selftest: Run base.delaywrite against plugin_s4_dc only, and with kerberos for faster connections

Browse Source 
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Andrew Bartlett 2014-06-20 22:28:51 +12:00 committed by Jeremy Allison
parent 0e224698f7
commit 00a83effc1
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source3/selftest/tests.py
View File

@ -293,8 +293,7 @@ tests= base + raw + smb2 + rpc + unix + local + rap + nbt + libsmbclient + idmap
for t in tests:
if t == "base.delaywrite":
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --maximum-runtime=900')
plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --maximum-runtime=900')
plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD -k yes --maximum-runtime=900')
elif t == "rap.sam":
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --option=doscharset=ISO-8859-1')
plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --option=doscharset=ISO-8859-1')

12
source4/torture/basic/delaywrite.c
View File

@ -92,7 +92,7 @@ static bool test_delayed_write_update(struct torture_context *tctx, struct smbcl
nt_time_string(tctx, finfo2.basic_info.out.write_time));
if (finfo1.basic_info.out.write_time != finfo2.basic_info.out.write_time) {
double diff = timeval_elapsed(&start);
if (diff < used_delay) {
if (diff < (used_delay / (double)1000000)) {
torture_result(tctx, TORTURE_FAIL, "Server updated write_time after %.2f seconds"
"(expected > %.2f) (wrong!)\n",
diff, used_delay / (double)1000000);
@ -1157,7 +1157,7 @@ static bool test_delayed_write_update2(struct torture_context *tctx, struct smbc
nt_time_string(tctx, finfo2.basic_info.out.write_time));
if (finfo1.basic_info.out.write_time != finfo2.basic_info.out.write_time) {
double diff = timeval_elapsed(&start);
if (diff < used_delay) {
if (diff < (used_delay / (double)1000000)) {
torture_result(tctx, TORTURE_FAIL, "Server updated write_time after %.2f seconds"
"(expected > %.2f) (wrong!)\n",
diff, used_delay / (double)1000000);
@ -1538,7 +1538,7 @@ static bool test_delayed_write_update3(struct torture_context *tctx,
if (finfo1.basic_info.out.write_time > finfo0.basic_info.out.write_time) {
double diff = timeval_elapsed(&start);
if (diff < (used_delay)) {
if (diff < (used_delay / (double)1000000)) {
torture_result(tctx, TORTURE_FAIL, "Server updated write_time after %.2f seconds "
"(write time update delay == %.2f) (wrong!)\n",
diff, used_delay / (double)1000000);
@ -1700,7 +1700,7 @@ static bool test_delayed_write_update3a(struct torture_context *tctx,
if (finfo1.basic_info.out.write_time > finfo0.basic_info.out.write_time) {
double diff = timeval_elapsed(&start);
if (diff < (used_delay)) {
if (diff < (used_delay / (double)1000000)) {
torture_result(tctx, TORTURE_FAIL, "Server updated write_time after %.2f seconds "
"(1sec == %.2f) (wrong!)\n",
diff, sec);
@ -1911,7 +1911,7 @@ static bool test_delayed_write_update3b(struct torture_context *tctx,
if (finfo1.basic_info.out.write_time > finfo0.basic_info.out.write_time) {
double diff = timeval_elapsed(&start);
if (diff < used_delay) {
if (diff < (used_delay / (double)1000000)) {
torture_result(tctx, TORTURE_FAIL, "Server updated write_time after %.2f seconds"
"(expected > %.2f) (wrong!)\n",
diff, used_delay / (double)1000000);
@ -2280,7 +2280,7 @@ static bool test_delayed_write_update4(struct torture_context *tctx,
if (finfo1.basic_info.out.write_time > finfo0.basic_info.out.write_time) {
double diff = timeval_elapsed(&start);
if (diff < used_delay) {
if (diff < (used_delay / (double)1000000)) {
torture_result(tctx, TORTURE_FAIL, "Server updated write_time after %.2f seconds"
"(expected > %.2f) (wrong!)\n",
diff, used_delay / (double)1000000);