mirror of
https://github.com/samba-team/samba.git
synced 2025-01-15 23:24:37 +03:00
r15690: - disable the lock cancel test against samba3
- disable the LOCK_NOT_GRANTED vs. FILE_LOCK_CONFLICT test against samba3 metze
This commit is contained in:
parent
ecd13b2fd2
commit
620cc182b3
@ -462,6 +462,11 @@ static BOOL test_async(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
|
|||||||
time_t t;
|
time_t t;
|
||||||
struct smbcli_request *req;
|
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)) {
|
if (!torture_setup_dir(cli, BASEDIR)) {
|
||||||
return False;
|
return False;
|
||||||
}
|
}
|
||||||
@ -791,6 +796,11 @@ static BOOL test_errorcode(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
|
|||||||
time_t start;
|
time_t start;
|
||||||
int t;
|
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)) {
|
if (!torture_setup_dir(cli, BASEDIR)) {
|
||||||
return False;
|
return False;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user