[1678] address review comments

diff --git a/tests/lettuce/features/multi_instance.feature b/tests/lettuce/features/multi_instance.feature
index 091f5254a5096c8f54981adf9651eba9b60854d4..864431d34505934464a983264a9433922b806104 100644 (file)
--- a/tests/lettuce/features/multi_instance.feature
+++ b/tests/lettuce/features/multi_instance.feature
@@ -15,8 +15,7 @@ Feature: Multiple instances
         When I remove bind10 configuration Boss/components value b10-auth-2
 
         Then the pid of process b10-auth should not have changed
-        # COMMENTED OUT BECAUSE OF CURRENT BUG
-        # And a query for example.com should have rcode REFUSED
+        And a query for example.com should have rcode REFUSED
 
         When I send bind10 the following commands
         """
@@ -33,5 +32,4 @@ Feature: Multiple instances
 
         When I remove bind10 configuration Boss/components value b10-auth
         Then the pid of process b10-auth-2 should not have changed
-        # COMMENTED OUT BECAUSE OF CURRENT BUG
-        #A query for example.com should have rcode REFUSED
+        A query for example.com should have rcode REFUSED

diff --git a/tests/lettuce/features/terrain/bind10_control.py b/tests/lettuce/features/terrain/bind10_control.py
index 3858d50f8d0b4c62bdb816e064dd3cd2be25cb9d..2a2383ab2ac9b4cc809d58b8fd80281f3bf54ec0 100644 (file)
--- a/tests/lettuce/features/terrain/bind10_control.py
+++ b/tests/lettuce/features/terrain/bind10_control.py
@@ -177,13 +177,38 @@ def parse_bindctl_output_as_data_structure():
        If it is valid, it is parsed and returned as whatever data
        structure it represented.
     """
-    # strip the 'Exit from bindctl' message. Why is it even there?
+    # strip any extra output after the last valid JSON character (it
+    # would contain 'Exit from bindctl' message, and depending on
+    # environment some other control-like characters).
+    # Why is this message even there?
     output = world.last_bindctl_stdout.replace("Exit from bindctl", "")
+    # And remove any other non-json junk at the end
+    output = output.replace("[^el\d}\"\]]*$", "")
     try:
         return json.loads(output)
     except ValueError as ve:
         assert False, "Last bindctl output does not appear to be a " +\
-                      "parseable data structure: " + str(ve)
+                      "parseable data structure: '" + output + "': " + str(ve)
+
+def find_process_pid(step, process_name):
+    """Helper function to request the running processes from Boss, and
+       return the pid of the process with the given process_name.
+       Fails with an assert if the response from boss is not valid JSON,
+       or if the process with the given name is not found.
+    """
+    # show_processes output is a list of lists, where the inner lists
+    # are of the form [ pid, "name" ]
+    # Not checking data form; errors will show anyway (if these turn
+    # out to be too vague, we can change this)
+    step.given('send bind10 the command Boss show_processes')
+    running_processes = parse_bindctl_output_as_data_structure()
+
+    for process in running_processes:
+        if process[1] == process_name:
+            return process[0]
+    return None
+    assert False, "Process named " + process_name +\
+                  " not found in output of Boss show_processes";
 
 @step("remember the pid of process ([\S]+)")
 def remember_pid(step, process_name):
@@ -197,21 +222,9 @@ def remember_pid(step, process_name):
        process name ('process <name>') the name of the component to store
                                        the pid of.
     """
-    step.given('send bind10 the command Boss show_processes')
-    running_processes = parse_bindctl_output_as_data_structure()
-    # show_processes output is a list of lists, where the inner lists
-    # are of the form [ pid, "name" ]
-    # Not checking data form; errors will show anyway (if these turn
-    # out to be too vague, we can change this)
-    found = False
     if world.process_pids is None:
         world.process_pids = {}
-    for process in running_processes:
-        if process[1] == process_name:
-            world.process_pids[process_name] = process[0]
-            found = True
-    assert found, "Process named " + process_name +\
-                  " not found in output of Boss show_processes";
+    world.process_pids[process_name] = find_process_pid(step, process_name)
 
 @step('pid of process ([\S]+) should not have changed')
 def check_pid(step, process_name):
@@ -224,25 +237,14 @@ def check_pid(step, process_name):
        Fails if that step has not been called (since world.process_pids
        does not exist).
     """
-    step.given('send bind10 the command Boss show_processes')
-    running_processes = parse_bindctl_output_as_data_structure()
-    # show_processes output is a list of lists, where the inner lists
-    # are of the form [ pid, "name" ]
-    # Not checking data form; errors will show anyway (if these turn
-    # out to be too vague, we can change this)
-    found = False
     assert world.process_pids is not None, "No process pids stored"
     assert process_name in world.process_pids, "Process named " +\
                                                process_name +\
                                                " was not stored"
-    for process in running_processes:
-        if process[1] == process_name:
-            assert world.process_pids[process_name] == process[0],\
+    pid = find_process_pid(step, process_name)
+    assert world.process_pids[process_name] == pid,\
                    "Expected pid: " + str(world.process_pids[process_name]) +\
-                   " Got pid: " + str(process[0])
-            found = True
-    assert found, "Process named " + process_name +\
-                  " not found in output of Boss show_processes";
+                   " Got pid: " + str(pid)
 
 @step('set bind10 configuration (\S+) to (.*)(?: with cmdctl port (\d+))?')
 def config_set_command(step, name, value, cmdctl_port):