summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-12-05 15:47:15 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:47:06 -0500
commit37cc5873e068716401ff0146842d00cdb1d935c4 (patch)
treeba8c7f6480f0dd76c459a18949cecf0ba406675d /source4
parent529b03be1363396ab8c1df811c44891deeb238b5 (diff)
downloadsamba-37cc5873e068716401ff0146842d00cdb1d935c4.tar.gz
samba-37cc5873e068716401ff0146842d00cdb1d935c4.tar.bz2
samba-37cc5873e068716401ff0146842d00cdb1d935c4.zip
r12075: remove NBT-WINSREPLICATION-QUICK test, as we now pass the NBT-WINSREPLICATION
test metze (This used to be commit 224dab45ab8de9fd4288c473b141541614cde422)
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/script/tests/test_nbt.sh2
-rw-r--r--source4/torture/nbt/winsreplication.c39
-rw-r--r--source4/torture/torture.c1
3 files changed, 1 insertions, 41 deletions
diff --git a/source4/script/tests/test_nbt.sh b/source4/script/tests/test_nbt.sh
index 4ed510e081..c230547db5 100755
--- a/source4/script/tests/test_nbt.sh
+++ b/source4/script/tests/test_nbt.sh
@@ -21,7 +21,7 @@ export PATH
testit "nmblookup -U $SERVER $SERVER" bin/nmblookup $TORTURE_OPTIONS -U $SERVER $SERVER || failed=`expr $failed + 1`
testit "nmblookup $SERVER" bin/nmblookup $TORTURE_OPTIONS $SERVER || failed=`expr $failed + 1`
-for f in NBT-REGISTER NBT-WINS NBT-WINSREPLICATION-QUICK; do
+for f in NBT-REGISTER NBT-WINS NBT-WINSREPLICATION; do
testit "$f" bin/smbtorture $TORTURE_OPTIONS //$SERVER/_none_ $f || failed=`expr $failed + 1`
done
diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c
index 7ab53c9679..3767722e35 100644
--- a/source4/torture/nbt/winsreplication.c
+++ b/source4/torture/nbt/winsreplication.c
@@ -9477,45 +9477,6 @@ static void test_conflict_owned_active_vs_replica_handler(struct nbt_name_socket
/*
test WINS replication operations
*/
-BOOL torture_nbt_winsreplication_quick(void)
-{
- const char *address;
- struct nbt_name name;
- TALLOC_CTX *mem_ctx = talloc_new(NULL);
- NTSTATUS status;
- BOOL ret = True;
- struct test_wrepl_conflict_conn *ctx;
-
- make_nbt_name_server(&name, lp_parm_string(-1, "torture", "host"));
-
- /* do an initial name resolution to find its IP */
- status = resolve_name(&name, mem_ctx, &address, NULL);
- if (!NT_STATUS_IS_OK(status)) {
- printf("Failed to resolve %s - %s\n",
- name.name, nt_errstr(status));
- talloc_free(mem_ctx);
- return False;
- }
-
- ret &= test_assoc_ctx1(mem_ctx, address);
- ret &= test_assoc_ctx2(mem_ctx, address);
-
- ret &= test_wins_replication(mem_ctx, address);
-
- ctx = test_create_conflict_ctx(mem_ctx, address);
- if (!ctx) return False;
-
- ret &= test_conflict_same_owner(ctx);
- ret &= test_conflict_owned_released_vs_replica(ctx);
-
- talloc_free(mem_ctx);
-
- return ret;
-}
-
-/*
- test WINS replication operations
-*/
BOOL torture_nbt_winsreplication(void)
{
const char *address;
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 62b85778c7..002ab5ee6b 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -2336,7 +2336,6 @@ static struct {
{"NBT-REGISTER", torture_nbt_register, 0},
{"NBT-WINS", torture_nbt_wins, 0},
{"NBT-DGRAM", torture_nbt_dgram, 0},
- {"NBT-WINSREPLICATION-QUICK", torture_nbt_winsreplication_quick, 0},
{"NBT-WINSREPLICATION", torture_nbt_winsreplication, 0},
/* libnet tests */