Cosmetic improvements to 'routing' test script

This commit is contained in:
Andrew Bettison 2013-02-14 16:02:09 +10:30
parent 2d4133315d
commit 433f49551a

View File

@ -60,6 +60,7 @@ teardown() {
report_all_servald_servers
}
doc_single_link="Start 2 instances on one link"
setup_single_link() {
setup_servald
assert_no_servald_processes
@ -67,8 +68,6 @@ setup_single_link() {
foreach_instance +A +B add_interface 1
foreach_instance +A +B start_routing_instance
}
doc_single_link="Start 2 instances on one link"
test_single_link() {
foreach_instance +A +B \
wait_until has_seen_instances +A +B
@ -79,6 +78,7 @@ test_single_link() {
assertStdoutGrep --matches=1 "^$SIDB:BROADCAST UNICAST :"
}
doc_multiple_nodes="Multiple nodes on one link"
setup_multiple_nodes() {
setup_servald
assert_no_servald_processes
@ -86,8 +86,6 @@ setup_multiple_nodes() {
foreach_instance +A +B +C +D add_interface 1
foreach_instance +A +B +C +D start_routing_instance
}
doc_multiple_nodes="Multiple nodes on one link"
test_multiple_nodes() {
foreach +A +B +C +D \
wait_until has_seen_instances +A +B +C +D
@ -104,6 +102,7 @@ test_multiple_nodes() {
assertStdoutGrep --matches=1 "^$SIDD:BROADCAST "
}
doc_scan="Simulate isolated clients"
setup_scan() {
setup_servald
assert_no_servald_processes
@ -117,13 +116,6 @@ setup_scan() {
set interfaces.1.dummy_filter_broadcasts 1
foreach_instance +A +B start_routing_instance
}
scan_completed() {
grep "Scan completed" $LOG||return1
return 0
}
doc_scan="Simulate isolated clients"
test_scan() {
set_instance +A
executeOk_servald scan
@ -135,18 +127,21 @@ test_scan() {
assertStdoutGrep --matches=1 "^$SIDB:UNICAST :"
}
scan_completed() {
grep "Scan completed" $LOG||return1
return 0
}
doc_broadcast_only="Broadcast packets only"
setup_broadcast_only() {
setup_servald
assert_no_servald_processes
foreach_instance +A +B create_single_identity
foreach_instance +A +B add_interface 1
foreach_instance +A +B \
executeOk_servald config \
set interfaces.1.dummy_filter_unicasts 1
foreach_instance +A +B \
executeOk_servald config set interfaces.1.dummy_filter_unicasts 1
foreach_instance +A +B start_routing_instance
}
doc_broadcast_only="Broadcast packets only"
test_broadcast_only() {
foreach_instance +A +B \
wait_until has_seen_instances +A +B
@ -157,6 +152,7 @@ test_broadcast_only() {
assertStdoutGrep --matches=1 "^$SIDB:BROADCAST :"
}
doc_prefer_unicast="Prefer unicast packets"
setup_prefer_unicast() {
setup_servald
assert_no_servald_processes
@ -168,8 +164,6 @@ setup_prefer_unicast() {
set debug.overlayframes 1
foreach_instance +A +B start_routing_instance
}
doc_prefer_unicast="Prefer unicast packets"
test_prefer_unicast() {
foreach_instance +A +B \
wait_until has_seen_instances +A +B
@ -181,6 +175,7 @@ test_prefer_unicast() {
assertGrep "$instance_servald_log" 'Choosing to send via unicast'
}
doc_multihop_linear="Start 4 instances in a linear arrangement"
setup_multihop_linear() {
setup_servald
assert_no_servald_processes
@ -190,8 +185,6 @@ setup_multihop_linear() {
foreach_instance +C +D add_interface 3
foreach_instance +A +B +C +D start_routing_instance
}
doc_multihop_linear="Start 4 instances in a linear arrangement"
test_multihop_linear() {
foreach_instance +A +B +C +D \
wait_until has_seen_instances +A +B +C +D