Fix minor inconsistencies in expected test output.
authorJonathan Maw <jonathan.maw@codethink.co.uk>
Thu, 9 Aug 2012 13:54:56 +0000 (14:54 +0100)
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>
Fri, 10 Aug 2012 10:13:01 +0000 (11:13 +0100)
In test-legacy-app-handling.xml, the timeout was wrong.

In test-target-startup-monitoring, the phrase "Applied the node state N"
had been changed to "Node state N applied" in everywhere but one place.

docs/reference/node-startup-controller/test-legacy-app-handling.xml
docs/reference/node-startup-controller/test-target-startup-monitoring.xml

index 1bdbdc7..4f1191f 100644 (file)
@@ -211,11 +211,11 @@ systemctl start node-startup-controller.service</programlisting>
           <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutdown client registered: bus name org.genivi.NodeStartupController1 object path /org/genivi/nodeStartupController1/ShutdownConsumer/1 shutdown mode 1 timeout 1500]</entry></row>
           <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Re-registered shutdown client: bus name org.genivi.NodeStartupController1 object path /org/genivi/nodeStartupController1/ShutdownConsumer/1 new shutdown mode 3 new timeout 500]</entry></row>
 
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutting down a client: bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController/ShutdownConsumer/1 shutdown mode 3 timeout 1000 request id XXXXXXX]</entry></row>
+          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutting down a client: bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController/ShutdownConsumer/1 shutdown mode 3 timeout 500 request id XXXXXXX]</entry></row>
           <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Waiting for client to shut down: request id XXXXXXX bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController1/ShutdownConsumer/1 shutdown mode 2]</entry></row>
           <row><entry>NSC-</entry> <entry>LAH-</entry> <entry>[Completing a lifecycle request: request id XXXXXXX]</entry></row>
 
-          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutting down a client: bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController/ShutdownConsumer/1 shutdown mode 3 timeout 1000 request id XXXXXXX]</entry></row>
+          <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Shutting down a client: bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController/ShutdownConsumer/1 shutdown mode 3 timeout 500 request id XXXXXXX]</entry></row>
           <row><entry>NSMD</entry> <entry>NSMC</entry> <entry>[Waiting for client to shut down: request id XXXXXXX bus name org.genivi.NodeStartupController1 object path /org/genivi/NodeStartupController1/ShutdownConsumer/1 shutdown mode 1]</entry></row>
           <row><entry>NSC-</entry> <entry>LAH-</entry> <entry>[Completing a lifecycle request: request id XXXXXXX]</entry></row>
         </tbody>
index d95210e..03aa889 100644 (file)
@@ -74,7 +74,7 @@ systemctl start node-startup-controller.service</programlisting>
           <row> <entry>APID</entry> <entry>CTID</entry> <entry>Payload</entry> </row>
         </thead>
         <tbody>
-          <row> <entry>NSMD</entry> <entry>NSMC</entry> <entry>[Applied the node state 2: yes]</entry></row>
+          <row> <entry>NSMD</entry> <entry>NSMC</entry> <entry>[Node state 2 applied: yes]</entry></row>
         </tbody>
       </tgroup></informaltable>
     </refsect2>