commit da9fd4a436de30cf05f62fbfc3d4ca93325b0f15
author Jon Hall <jhall@ciena.com> Thu Feb 16 14:23:38 2017 -0800
committer Ray Milkey <ray@onlab.us> Tue Feb 21 18:56:26 2017 +0000
tree 1651d1a84c09df9ae524ca7116a4a917e82ceaf9
parent 3120778d81d0247de6fdde72a5b07db707b3cb7a

Create setup and cleanup tests for stc dist tests

Change-Id: Ie977697a645be82e26ebf13d2510eb891a7c8b8c
(cherry picked from commit 4ad86cfda8f0dc2e87a1ef2ec0a48506c09274a0)

tools/test/scenarios/dist-work-queue.xml

diff --git a/tools/test/scenarios/dist-work-queue.xml b/tools/test/scenarios/dist-work-queue.xml
index 7bbb511..c0b4529 100644
--- a/tools/test/scenarios/dist-work-queue.xml
+++ b/tools/test/scenarios/dist-work-queue.xml
@@ -18,45 +18,51 @@
           description="ONOS WorkQueue distributed primitive Test">
     <group name="Distributed-Primitive-WorkQueue">
 
-        <step name="Distributed-Primitive-WorkQueue.Activate-Distributed-Primitives-App"
-            exec="onos ${OCI} app activate org.onosproject.distributedprimitives"/>
-
-        <step name="Distributed-Primitive-WorkQueue.Test-Queue-AddOne" requires="^"
+        <step name="Distributed-Primitive-WorkQueue.Test-Queue-AddOne"
+              requires="Distributed-Primitives-Setup"
               exec="onos-execute-expect ${OCI} work-queue-test stc-test-work-queue add foo --expect Done"/>
 
-        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Check-Pending-1" requires="^"
+        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Check-Pending-1"
+              requires="^"
               exec="onos-cluster-execute-expect work-queue-test stc-test-work-queue totalPending --expect 1"/>
 
-        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Check-InProgress-1" requires="^"
+        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Check-InProgress-1"
+              requires="^"
               exec="onos-cluster-execute-expect work-queue-test stc-test-work-queue totalInProgress --expect 0"/>
 
-        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Check-TotalCompleted-1" requires="^"
+        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Check-TotalCompleted-1"
+              requires="^"
               exec="onos-cluster-execute-expect work-queue-test stc-test-work-queue totalCompleted --expect 0"/>
 
-        <step name="Distributed-Primitive-WorkQueue.Test-Queue-AddMultiple" requires="^"
+        <step name="Distributed-Primitive-WorkQueue.Test-Queue-AddMultiple"
+              requires="^"
               exec="onos-execute-expect ${OCI} work-queue-test stc-test-work-queue addMultiple bar car --expect Done"/>
 
-        <step name="Distributed-Primitive-WorkQueue.Test-Queue-TakeAndComplete" requires="^"
+        <step name="Distributed-Primitive-WorkQueue.Test-Queue-TakeAndComplete"
+              requires="^"
               exec="onos-execute-expect ${OCI} work-queue-test stc-test-work-queue takeAndComplete 3 --expect Done"/>
 
-        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Check-Pending-2" requires="^"
+        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Check-Pending-2"
+              requires="^"
               exec="onos-cluster-execute-expect work-queue-test stc-test-work-queue totalPending --expect 0"/>
 
-        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Check-InProgress-2" requires="^"
+        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Check-InProgress-2"
+              requires="^"
               exec="onos-cluster-execute-expect work-queue-test stc-test-work-queue totalInProgress --expect 0"/>
 
-        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Check-TotalCompleted-2" requires="^"
+        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Check-TotalCompleted-2"
+              requires="^"
               exec="onos-cluster-execute-expect work-queue-test stc-test-work-queue totalCompleted --expect 3"/>
 
-        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Destroy" requires="^"
+        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Destroy"
+              requires="^"
               exec="onos ${OCI} work-queue-test stc-test-work-queue destroy"/>
 
         <!--Check with check logs-->
-        <step name="Distributed-Primitive-WorkQueue.Check-Log-Exceptions" requires="^"
+        <step name="Distributed-Primitive-WorkQueue.Check-Log-Exceptions"
+              requires="^"
               exec="onos-check-logs ${OCI}"/>
 
-        <step name="Distributed-Primitive-WorkQueue.Teardown-Distributed-Primitives-Test-App" requires="^"
-              exec="onos ${OCI} app deactivate org.onosproject.distributedprimitives"/>
     </group>
 </scenario>