mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-18 19:01:06 +02:00
Code Issues Projects Releases Wiki Activity

Fix stc dependencies on external scenarios

Browse Source 
- also only install test application once in dist-test-seq

Change-Id: I4a002cd900e8133ad2163fb6b946e082174fcf85
This commit is contained in:
Jon Hall 2017-03-14 13:25:53 -07:00 committed by Ray Milkey
parent 7c28369791
commit e8d06bf283
7 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/test/scenarios/dist-counter.xml
View File

@ -19,7 +19,6 @@
<group name="Distributed-Primitive-Counter"> <group name="Distributed-Primitive-Counter">
<step name="Distributed-Primitive-Counter.Test-Counter-Initial-Value" <step name="Distributed-Primitive-Counter.Test-Counter-Initial-Value"
requires="Distributed-Primitives-Setup"
exec="onos-cluster-execute-expect counter-test test-counter get --expect 0"/> exec="onos-cluster-execute-expect counter-test test-counter get --expect 0"/>
<step name="Distributed-Primitive-Counter.Test-Counter-Set" <step name="Distributed-Primitive-Counter.Test-Counter-Set"

1
tools/test/scenarios/dist-leader.xml
View File

@ -19,7 +19,6 @@
<group name="Distributed-Primitive-Leader"> <group name="Distributed-Primitive-Leader">
<step name="Distributed-Primitive-Leader.Test-Initial-No-Leader" <step name="Distributed-Primitive-Leader.Test-Initial-No-Leader"
requires="Distributed-Primitives-Setup"
exec="onos-cluster-execute-expect leader-test test-elector show foo --expect leader=none#candidates=none"/> exec="onos-cluster-execute-expect leader-test test-elector show foo --expect leader=none#candidates=none"/>
<step name="Distributed-Primitive-Leader.Test-Leader-Run" <step name="Distributed-Primitive-Leader.Test-Leader-Run"

1
tools/test/scenarios/dist-map.xml
View File

@ -19,7 +19,6 @@
<group name="Distributed-Primitive-Map"> <group name="Distributed-Primitive-Map">
<step name="Distributed-Primitive-Map.Test-Map-Get" <step name="Distributed-Primitive-Map.Test-Map-Get"
requires="Distributed-Primitives-Setup"
exec="onos-cluster-execute-expect map-test foo get a --expect null"/> exec="onos-cluster-execute-expect map-test foo get a --expect null"/>
<step name="Distributed-Primitive-Map.Test-Map-Put" <step name="Distributed-Primitive-Map.Test-Map-Put"

12
tools/test/scenarios/dist-test-seq.xml
View File

@ -22,17 +22,17 @@
<!--<import file="${ONOS_SCENARIOS}/setup.xml"/> <!--<import file="${ONOS_SCENARIOS}/setup.xml"/>
<dependency name="Setup" requires="Prerequisites"/>--> <dependency name="Setup" requires="Prerequisites"/>-->
<sequential var="${OC#}" starts="Distributed-App-${#}" ends="Check-Distributed-Exceptions-${#-1}"> <step name="Distributed-App-Activate"
<step name="Distributed-App-${#}" exec="onos ${OC1} app activate org.onosproject.distributedprimitives"/>
requires="Setup"
exec="onos ${OC#} app activate org.onosproject.distributedprimitives"/> <sequential var="${OC#}" starts="Test-Counter-Increment-${#}" ends="Check-Distributed-Exceptions-${#-1}">
<step name="Test-Counter-Increment-${#}" <step name="Test-Counter-Increment-${#}"
requires="Distributed-App-${#}" requires="Distributed-App-Activate"
exec="onos-execute-expect ${OC#} counter-test-increment fooCounter 5 --expect updated"/> exec="onos-execute-expect ${OC#} counter-test-increment fooCounter 5 --expect updated"/>
<step name="Test-Add-${#}" <step name="Test-Add-${#}"
requires="Distributed-App-${#}" requires="Test-Counter-Increment-${#}"
exec="onos-execute-expect ${OC#} set-test-add fooSet foo --expect added"/> exec="onos-execute-expect ${OC#} set-test-add fooSet foo --expect added"/>
<step name="Test-Get-${#}" <step name="Test-Get-${#}"

2
tools/test/scenarios/dist-test.xml
View File

@ -19,7 +19,7 @@
<group name="Distributed-Primitives"> <group name="Distributed-Primitives">
<import file="${ONOS_SCENARIOS}/dist-setup.xml"/> <import file="${ONOS_SCENARIOS}/dist-setup.xml"/>
<dependency name="Distributed-Primitives-Setup" requires="Setup"/> <dependency name="Distributed-Primitives-Setup"/>
<group name="Distributed-Primitives-Internal" requires="Distributed-Primitives-Setup"> <group name="Distributed-Primitives-Internal" requires="Distributed-Primitives-Setup">

1
tools/test/scenarios/dist-value.xml
View File

@ -19,7 +19,6 @@
<group name="Distributed-Primitive-Value"> <group name="Distributed-Primitive-Value">
<step name="Distributed-Primitive-Value.Test-Value-Initial-Value" <step name="Distributed-Primitive-Value.Test-Value-Initial-Value"
requires="Distributed-Primitives-Setup"
exec="onos-cluster-execute-expect value-test test-value get --expect null"/> exec="onos-cluster-execute-expect value-test test-value get --expect null"/>
<step name="Distributed-Primitive-Value.Test-Value-Set" <step name="Distributed-Primitive-Value.Test-Value-Set"

1
tools/test/scenarios/dist-work-queue.xml
View File

@ -19,7 +19,6 @@
<group name="Distributed-Primitive-WorkQueue"> <group name="Distributed-Primitive-WorkQueue">
<step name="Distributed-Primitive-WorkQueue.Test-Queue-AddOne" <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"/> 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" <step name="Distributed-Primitive-WorkQueue.Test-Queue-Check-Pending-1"