1
0
mirror of https://github.com/samba-team/samba.git synced 2025-08-29 13:49:30 +03:00

s4:torture - partially revert "s4:torture - prefer the termination "return"s at the end of two unittests"

This partially reverts commit 54a5c398aa.
As tridge pointed out I've overseen the nested loop in "run_iometer".
Therefore we end in a infinite loop. Obviously it wasn't run by "make
test" since then I would have detected it.

Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Tue Nov 30 09:23:00 CET 2010 on sn-devel-104
This commit is contained in:
Matthias Dieter Wallnöfer
2010-11-30 08:32:22 +01:00
parent 2a5daa7ddb
commit 10d1cd7af7

View File

@ -1340,7 +1340,7 @@ static bool run_iometer(struct torture_context *tctx,
for (i=0; i<num_reads; i++) {
ssize_t res;
if (ops++ > torture_numops) {
break;
return true;
}
res = smbcli_read(cli->tree, fnum, buf,
random() % filesize, sizeof(buf));
@ -1351,7 +1351,7 @@ static bool run_iometer(struct torture_context *tctx,
for (i=0; i<num_writes; i++) {
ssize_t res;
if (ops++ > torture_numops) {
break;
return true;
}
res = smbcli_write(cli->tree, fnum, 0, buf,
random() % filesize, sizeof(buf));
@ -1360,8 +1360,6 @@ static bool run_iometer(struct torture_context *tctx,
smbcli_errstr(cli->tree)));
}
}
return true;
}
/**