diff --git a/tests/compatibility b/tests/compatibility index 22ccbf75..69dc36a3 100755 --- a/tests/compatibility +++ b/tests/compatibility @@ -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 diff --git a/tests/directory_service b/tests/directory_service index bf430693..16e01cbc 100755 --- a/tests/directory_service +++ b/tests/directory_service @@ -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 \ diff --git a/tests/rhizomestress b/tests/rhizomestress index e919d09d..a99d7c6d 100755 --- a/tests/rhizomestress +++ b/tests/rhizomestress @@ -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 diff --git a/tests/routing b/tests/routing index c0a2ce8e..8cdfb5e3 100755 --- a/tests/routing +++ b/tests/routing @@ -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 \ diff --git a/tests/server b/tests/server index dab8bbd2..754bcb51 100755 --- a/tests/server +++ b/tests/server @@ -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() {