1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-27 14:04:05 +03:00

s4-torture: Fix the raw.notify mask test

When we do the notify triggers via a different client connection, adding the
notify record becomes subject to a race. Add a dummy operation after the
initial changenotify request was sent to make sure the notify record actually
arrived.

Autobuild-User: Volker Lendecke <vl@samba.org>
Autobuild-Date: Wed Apr 18 19:47:53 CEST 2012 on sn-devel-104
This commit is contained in:
Volker Lendecke 2012-04-18 18:05:24 +02:00
parent 03291270a6
commit b0aaa49e3f

View File

@ -585,6 +585,7 @@ static bool test_notify_mask(struct torture_context *tctx,
NTSTATUS status;
union smb_notify notify;
union smb_open io;
union smb_chkpath chkpath;
int fnum, fnum2;
uint32_t mask;
int i;
@ -621,6 +622,8 @@ static bool test_notify_mask(struct torture_context *tctx,
notify.nttrans.in.buffer_size = 1000;
notify.nttrans.in.recursive = true;
chkpath.chkpath.in.path = "\\";
#define NOTIFY_MASK_TEST(test_name, setup, op, cleanup, Action, expected, nchanges) \
do { \
smbcli_getatr(cli->tree, test_name, NULL, NULL, NULL); \
@ -633,6 +636,7 @@ static bool test_notify_mask(struct torture_context *tctx,
notify.nttrans.in.file.fnum = fnum; \
notify.nttrans.in.completion_filter = (1<<i); \
req = smb_raw_changenotify_send(cli->tree, &notify); \
smb_raw_chkpath(cli->tree, &chkpath); \
op \
smb_msleep(200); smb_raw_ntcancel(req); \
status = smb_raw_changenotify_recv(req, tctx, &notify); \