diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-05-18 12:17:56 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:08:06 -0500 |
| commit | 5a8ebb7b679c0c79cb0f95ca7b3d92aaa6ce0cdd (patch) | |
| tree | 7bc8d01f325e319adf52bf1675764a1bb3b52f63 | |
| parent | a1a6407508f850843b9b3c37515b63975ea2c5cc (diff) | |
| download | samba-5a8ebb7b679c0c79cb0f95ca7b3d92aaa6ce0cdd.tar.gz samba-5a8ebb7b679c0c79cb0f95ca7b3d92aaa6ce0cdd.tar.xz samba-5a8ebb7b679c0c79cb0f95ca7b3d92aaa6ce0cdd.zip | |
r15690: - disable the lock cancel test against samba3
- disable the LOCK_NOT_GRANTED vs. FILE_LOCK_CONFLICT test against samba3
metze
(This used to be commit 620cc182b37918dc7a0cc45dbbbbf708ad76d187)
| -rw-r--r-- | source4/torture/raw/lock.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/source4/torture/raw/lock.c b/source4/torture/raw/lock.c index 0a2ed5260b..a62a240355 100644 --- a/source4/torture/raw/lock.c +++ b/source4/torture/raw/lock.c @@ -462,6 +462,11 @@ static BOOL test_async(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) time_t t; struct smbcli_request *req; + if (lp_parm_bool(-1, "target", "samba3", False)) { + printf("SAMBA3: ignore testing LOCKING_ANDX_CANCEL_LOCK...\n"); + return True; + } + if (!torture_setup_dir(cli, BASEDIR)) { return False; } @@ -791,6 +796,11 @@ static BOOL test_errorcode(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) time_t start; int t; + if (lp_parm_bool(-1, "target", "samba3", False)) { + printf("SAMBA3: ignore testing LOCK_NOT_GRANTED vs. FILE_LOCK_CONFLICT...\n"); + return True; + } + if (!torture_setup_dir(cli, BASEDIR)) { return False; } |