sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

r18371: made the directory depth notify test independent of timing

Browse Source
This commit is contained in:
Andrew Tridgell 2006-09-11 07:58:08 +00:00 committed by Gerald (Jerry) Carter
parent 31bbf865a0
commit 39458e62f5
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source/torture/raw/notify.c
View File

@ -979,12 +979,14 @@ static BOOL test_notify_tree(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
union smb_notify notify;
union smb_open io;
struct smbcli_request *req;
struct timeval tv;
struct {
const char *path;
BOOL recursive;
uint32_t filter;
int expected;
int fnum;
int counted;
} dirs[] = {
{BASEDIR "\\abc", True, FILE_NOTIFY_CHANGE_NAME, 30 },
{BASEDIR "\\zqy", True, FILE_NOTIFY_CHANGE_NAME, 8 },
@ -1009,6 +1011,7 @@ static BOOL test_notify_tree(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
};
int i;
NTSTATUS status;
BOOL all_done = False;
printf("TESTING CHANGE NOTIFY FOR DIFFERENT DEPTHS\n");
@ -1053,9 +1056,10 @@ static BOOL test_notify_tree(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
talloc_free(path);
}
/* give a bit of time for all the events to propogate */
sleep(4);
/* give a bit of time for the events to propogate */
tv = timeval_current();
do {
/* count events that have happened in each dir */
for (i=0;i<ARRAY_SIZE(dirs);i++) {
notify.nttrans.in.file.fnum = dirs[i].fnum;
@ -1063,10 +1067,24 @@ static BOOL test_notify_tree(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
smb_raw_ntcancel(req);
notify.nttrans.out.num_changes = 0;
status = smb_raw_changenotify_recv(req, mem_ctx, &notify);
if (notify.nttrans.out.num_changes != dirs[i].expected) {
dirs[i].counted += notify.nttrans.out.num_changes;
}
all_done = True;
for (i=0;i<ARRAY_SIZE(dirs);i++) {
if (dirs[i].counted != dirs[i].expected) {
all_done = False;
}
}
} while (!all_done && timeval_elapsed(&tv) < 20);
printf("took %.4f seconds to propogate all events\n", timeval_elapsed(&tv));
for (i=0;i<ARRAY_SIZE(dirs);i++) {
if (dirs[i].counted != dirs[i].expected) {
printf("ERROR: i=%d expected %d got %d for '%s'\n",
i, dirs[i].expected, notify.nttrans.out.num_changes,
dirs[i].path);
i, dirs[i].expected, dirs[i].counted, dirs[i].path);
ret = False;
}
}