svn commit: samba r12066 - in
branches/SAMBA_4_0/source/torture/nbt: .
metze at samba.org
metze at samba.org
Mon Dec 5 07:56:23 GMT 2005
Author: metze
Date: 2005-12-05 07:56:22 +0000 (Mon, 05 Dec 2005)
New Revision: 12066
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12066
Log:
- add a unique,active,owner vs. unique,active,replica tests where
we respond with the replicas address to the challenge
- fix some skip checks
metze
Modified:
branches/SAMBA_4_0/source/torture/nbt/winsreplication.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/nbt/winsreplication.c
===================================================================
--- branches/SAMBA_4_0/source/torture/nbt/winsreplication.c 2005-12-05 06:55:20 UTC (rev 12065)
+++ branches/SAMBA_4_0/source/torture/nbt/winsreplication.c 2005-12-05 07:56:22 UTC (rev 12066)
@@ -8489,7 +8489,7 @@
{
.line = __location__,
.name = _NBT_NAME("_MA_MA_SM_U", 0x00, NULL),
- .skip = (ctx->addresses_mhomed_num != 2),
+ .skip = (ctx->addresses_mhomed_num < 2),
.wins = {
.nb_flags = 0,
.mhomed = True,
@@ -8516,7 +8516,7 @@
{
.line = __location__,
.name = _NBT_NAME("_MA_MA_SB_P", 0x00, NULL),
- .skip = (ctx->addresses_mhomed_num != 2),
+ .skip = (ctx->addresses_mhomed_num < 2),
.wins = {
.nb_flags = 0,
.mhomed = True,
@@ -8576,7 +8576,7 @@
{
.line = __location__,
.name = _NBT_NAME("_MA_MA_SB_PRA", 0x00, NULL),
- .skip = (ctx->addresses_all_num < 3),
+ .skip = (ctx->addresses_all_num < 2),
.wins = {
.nb_flags = 0,
.mhomed = True,
@@ -8608,7 +8608,7 @@
.line = __location__,
.name = _NBT_NAME("_MA_MA_SB_O", 0x00, NULL),
- .skip = (ctx->addresses_all_num < 3),
+ .skip = (ctx->addresses_all_num < 2),
.wins = {
.nb_flags = 0,
.mhomed = True,
@@ -8638,7 +8638,7 @@
{
.line = __location__,
.name = _NBT_NAME("_MA_MA_SB_N", 0x00, NULL),
- .skip = (ctx->addresses_mhomed_num != 2),
+ .skip = (ctx->addresses_mhomed_num < 2),
.wins = {
.nb_flags = 0,
.mhomed = True,
@@ -8670,7 +8670,7 @@
.line = __location__,
.section= "Test Replica vs. owned active: some more UNIQUE,MHOMED combinations",
.name = _NBT_NAME("_MA_UA_SB_P", 0x00, NULL),
- .skip = (ctx->addresses_all_num < 3),
+ .skip = (ctx->addresses_all_num < 2),
.wins = {
.nb_flags = 0,
.mhomed = True,
@@ -8693,6 +8693,39 @@
},
},
/*
+ * unique,active vs. unique,active with different ip(s), positive response, with replicas address
+ * TODO: check why the server sends a name release demand for one address?
+ * the release demand has no effect to the database record...
+ */
+ {
+ .line = __location__,
+ .name = _NBT_NAME("_UA_UA_DI_PRA", 0x00, NULL),
+ .skip = (ctx->addresses_all_num < 2),
+ .wins = {
+ .nb_flags = 0,
+ .mhomed = False,
+ .num_ips = ctx->addresses_best_num,
+ .ips = ctx->addresses_best,
+ .apply_expected = True
+ },
+ .defend = {
+ .timeout = 10,
+ .positive = True,
+ .num_ips = ctx->addresses_best2_num,
+ .ips = ctx->addresses_best2,
+ .late_release = True
+ },
+ .replica= {
+ .type = WREPL_TYPE_UNIQUE,
+ .state = WREPL_STATE_ACTIVE,
+ .node = WREPL_NODE_B,
+ .is_static = False,
+ .num_ips = ctx->addresses_best2_num,
+ .ips = ctx->addresses_best2,
+ .apply_expected = False,
+ },
+ },
+ /*
* unique,active vs. unique,active with different ip(s), positive response, with all addresses
*/
{
More information about the samba-cvs
mailing list