Fixed a failed unit test and added more to the setup scenario.
Change-Id: I28ee6627834f8964d5d06756afb44e6213c8afaa
diff --git a/tools/test/scenarios/setup.xml b/tools/test/scenarios/setup.xml
index bd12216..d43e77c 100644
--- a/tools/test/scenarios/setup.xml
+++ b/tools/test/scenarios/setup.xml
@@ -16,14 +16,22 @@
<scenario name="setup" description="ONOS cluster setup">
<group name="Setup">
<step name="Push-Bits" exec="onos-push-bits-through-proxy" if="${OCT}"/>
+
<parallel var="${OC#}">
<step name="Uninstall-${#}" exec="onos-uninstall ${OC#}"/>
+
<step name="Install-${#}" exec="onos-install ${OC#}"
requires="Uninstall-${#},Push-Bits"/>
+
<step name="Wait-for-Start-${#}" exec="onos-wait-for-start ${OC#}"
requires="Install-${#}"/>
+
<step name="Check-Logs-${#}" exec="onos-check-logs ${OC#}"
requires="-Wait-for-Start-${#}"/>
+ <step name="Check-Components-${#}" exec="onos-check-components ${OC#}"
+ requires="-Wait-for-Start-${#}"/>
+ <step name="Check-Apps-${#}" exec="onos-check-apps ${OC#}"
+ requires="-Wait-for-Start-${#}"/>
</parallel>
</group>
</scenario>