s4:torture/nbt/winsreplication: assert the nbt name before the type
authorStefan Metzmacher <metze@samba.org>
Sat, 30 Apr 2011 07:40:11 +0000 (09:40 +0200)
committerStefan Metzmacher <metze@samba.org>
Sat, 30 Apr 2011 09:43:30 +0000 (11:43 +0200)
I hope that will make it easier to find problems
with the flakey samba4.nbt.winsreplication.owned test.

metze

source4/torture/nbt/winsreplication.c

index 757ea54aa77db403b4dfbc4b8d7363f99ed2f6e9..071c19f6f098b8f34e6daf62b96849fd6d69153d 100644 (file)
@@ -9618,8 +9618,8 @@ static void test_conflict_owned_active_vs_replica_handler_query(struct nbt_name_
 
        name = &req_packet->questions[0].name;
 
-       _NBT_ASSERT(name->type, rec->name.type);
        _NBT_ASSERT_STRING(name->name, rec->name.name);
+       _NBT_ASSERT(name->type, rec->name.type);
        _NBT_ASSERT_STRING(name->scope, rec->name.scope);
 
        _NBT_ASSERT(rec->defend.expect_release, false);
@@ -9717,8 +9717,8 @@ static void test_conflict_owned_active_vs_replica_handler_release(
 
        name = &req_packet->questions[0].name;
 
-       _NBT_ASSERT(name->type, rec->name.type);
        _NBT_ASSERT_STRING(name->name, rec->name.name);
+       _NBT_ASSERT(name->type, rec->name.type);
        _NBT_ASSERT_STRING(name->scope, rec->name.scope);
 
        _NBT_ASSERT(rec->defend.expect_release, true);