Browse Source

[1678] start with two instances

Jelte Jansen 13 years ago
parent
commit
cb1ca47492

+ 1 - 1
tests/lettuce/configurations/multi_instance/multi_auth.config.orig

@@ -1 +1 @@
-{"version": 2, "Auth": {"listen_on": [{"port": 47806, "address": "0.0.0.0"}]}, "Boss": {"components": {"b10-auth": {"kind": "needed", "special": "auth"}, "b10-cmdctl": {"kind": "needed", "special": "cmdctl"}}}}
+{"version": 2, "Auth": {"listen_on": [{"port": 47806, "address": "0.0.0.0"}]}, "Boss": {"components": {"b10-auth-2": {"kind": "needed", "special": "auth"}, "b10-auth": {"kind": "needed", "special": "auth"}, "b10-cmdctl": {"kind": "needed", "special": "cmdctl"}}}}

+ 2 - 15
tests/lettuce/features/multi_instance.feature

@@ -3,27 +3,14 @@ Feature: Multiple instances
     removing them does not affect the running of other instances
 
     Scenario: Multiple instances
-        # Start out with one instance, add a second, remove it again,
-        # add it again, then remove the first.
+        # This config should have two running instances
         Given I have bind10 running with configuration multi_instance/multi_auth.config
         And bind10 module Auth should be running
         A query for example.com should have rcode REFUSED
 
         # this also checks whether the process is running
         If I remember the pid of process b10-auth
-
-        When I send bind10 the following commands
-        """
-        config add Boss/components b10-auth-2
-        config set Boss/components/b10-auth-2/special auth
-        config set Boss/components/b10-auth-2/kind needed
-        config commit
-        """
-        And wait for new bind10 stderr message AUTH_SERVER_STARTED
-
-        Then the pid of process b10-auth should not have changed
-
-        A query for example.com should have rcode REFUSED
+        And remember the pid of process b10-auth-2
 
         When I remove bind10 configuration Boss/components value b10-auth-2