ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-19 05:07:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Issue #20: remove unique socket names from tests

Browse Source 
The recent work on abstract local socket names means that every instance has
its own unique abstract socket name anyway, so there is no need for test
scripts to use $TFWUNIQUE in MDP and Monitor socket names to avoid
intereference when run concurrently.
This commit is contained in:
Andrew Bettison 2013-09-20 14:24:55 +09:30
parent cc96e08e9d
commit 4851eaf536
5 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/compatibility
View File

@ -59,15 +59,11 @@ test_dna_090_version() {
set_instance +A
executeOk_servald config \
set interfaces.0.dummy "$DUMMYNET" \
set monitor.socket "org.servalproject.servald.monitor.socket.$TFWUNIQUE.$instance_name" \
set mdp.socket "org.servalproject.servald.mdp.socket.$TFWUNIQUE.$instance_name" \
set debug.overlayframes on
start_servald_090
set_instance +B
executeOk_servald config \
set interfaces.1.file "$DUMMYNET" \
set monitor.socket "org.servalproject.servald.monitor.socket.$TFWUNIQUE.$instance_name" \
set mdp.socket "org.servalproject.servald.mdp.socket.$TFWUNIQUE.$instance_name" \
set debug.linkstate on \
set debug.overlayrouting on
create_single_identity

2
tests/directory_service
View File

@ -96,8 +96,6 @@ interface_up() {
start_routing_instance() {
executeOk_servald config \
set server.interface_path "$SERVALD_VAR" \
set monitor.socket "org.servalproject.servald.monitor.socket.$TFWUNIQUE.$instance_name" \
set mdp.socket "org.servalproject.servald.mdp.socket.$TFWUNIQUE.$instance_name" \
set rhizome.enable No \
set log.console.show_pid on \
set log.console.show_time on \

2
tests/rhizomestress
View File

@ -74,8 +74,6 @@ setup_StressRhizomeTransfer() {
start_instance() {
executeOk_servald config \
set server.interface_path "$SERVALD_VAR" \
set monitor.socket "org.servalproject.servald.monitor.socket.$TFWUNIQUE.$instance_name" \
set mdp.socket "org.servalproject.servald.mdp.socket.$TFWUNIQUE.$instance_name" \
set interfaces.0.file dummy \
set interfaces.0.dummy_address 127.0.0.$instance_number \
set interfaces.0.dummy_netmask 255.255.255.224

2
tests/routing
View File

@ -78,8 +78,6 @@ path_exists() {
start_routing_instance() {
executeOk_servald config \
set server.interface_path "$SERVALD_VAR" \
set monitor.socket "org.servalproject.servald.monitor.socket.$TFWUNIQUE.$instance_name" \
set mdp.socket "org.servalproject.servald.mdp.socket.$TFWUNIQUE.$instance_name" \
set debug.mdprequests yes \
set debug.linkstate yes \
set debug.verbose yes \

5
tests/server
View File

@ -28,10 +28,7 @@ setup() {
setup_interfaces() {
>$TFWTMP/dummy
executeOk_servald config \
set interfaces "+>$TFWTMP/dummy" \
set monitor.socket "org.servalproject.servald.monitor.socket.$TFWUNIQUE.$instance_name" \
set mdp.socket "org.servalproject.servald.mdp.socket.$TFWUNIQUE.$instance_name"
executeOk_servald config set interfaces "+>$TFWTMP/dummy"
}
teardown() {