summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Maw <jonathan.maw@codethink.co.uk>2012-08-09 14:54:56 +0100
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2012-08-10 11:13:01 +0100
commit891bd72390cafd232f9446b43f07295cb04c27ff (patch)
tree66290cd741b7d90395f775bef956bde07ed371ce
parent32b833ead49a6b001e9a77ee89a045e62b8c2b97 (diff)
downloadnode-startup-controller-891bd72390cafd232f9446b43f07295cb04c27ff.tar.gz
Fix minor inconsistencies in expected test output.
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.
-rw-r--r--docs/reference/node-startup-controller/test-legacy-app-handling.xml4
-rw-r--r--docs/reference/node-startup-controller/test-target-startup-monitoring.xml2
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/reference/node-startup-controller/test-legacy-app-handling.xml b/docs/reference/node-startup-controller/test-legacy-app-handling.xml
index 1bdbdc7..4f1191f 100644
--- a/docs/reference/node-startup-controller/test-legacy-app-handling.xml
+++ b/docs/reference/node-startup-controller/test-legacy-app-handling.xml
@@ -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>
diff --git a/docs/reference/node-startup-controller/test-target-startup-monitoring.xml b/docs/reference/node-startup-controller/test-target-startup-monitoring.xml
index d95210e..03aa889 100644
--- a/docs/reference/node-startup-controller/test-target-startup-monitoring.xml
+++ b/docs/reference/node-startup-controller/test-target-startup-monitoring.xml
@@ -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>