commit df5eeb13b38cbbb32e974a2c0a92a89e537383bb
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Fri May 05 21:19:02 2017 -0700
committer Ray Milkey <ray@onlab.us> Mon May 08 18:59:52 2017 +0000
tree d904982314e836ed629f446a30157142a305bc5d
parent 02a125e639d43572143e576bb5f685375c991e1d

Ignore Exception between expected marker logs.

Change-Id: I3b7f155e3e9598a2c1de6484605e3f09c70e14dd

tools/test/scenarios/net-point-intent.xml

diff --git a/tools/test/scenarios/net-point-intent.xml b/tools/test/scenarios/net-point-intent.xml
index 7626287..3b3134d 100644
--- a/tools/test/scenarios/net-point-intent.xml
+++ b/tools/test/scenarios/net-point-intent.xml
@@ -33,6 +33,7 @@
               exec="onos-check-intent ${OC1} xy INSTALLED"/>
 
         <import file="${ONOS_SCENARIOS}/net-link-down-up.xml" namespace="P2P-Intent"/>
+        <import file="${ONOS_SCENARIOS}/log-mark.xml" namespace="P2P-Intent"/>
         <dependency name="P2P-Intent.Net-Link-Down-Up"
                     requires="P2P-Intent.Validate-Intent-XY-Installed,
                               P2P-Intent.Validate-Intent-YX-Installed"/>
@@ -42,18 +43,24 @@
         <step name="P2P-Intent.Validate-Intent-YX-Installed-Still" requires="P2P-Intent.Link-1-Down"
               exec="onos-check-intent ${OC1} yx INSTALLED"/>
 
-        <dependency name="P2P-Intent.Link-2-Down"
+        <dependency name="P2P-Intent.ExpectExceptionMarkBegin"
                     requires="~P2P-Intent.Validate-Intent-XY-Installed-Still,
                               ~P2P-Intent.Validate-Intent-YX-Installed-Still"/>
 
+        <dependency name="P2P-Intent.Link-2-Down"
+                    requires="P2P-Intent.ExpectExceptionMarkBegin"/>
+
         <step name="P2P-Intent.Validate-Intent-XY-Failed" requires="P2P-Intent.Link-2-Down"
               exec="onos-check-intent ${OC1} xy FAILED"/>
         <step name="P2P-Intent.Validate-Intent-YX-Failed" requires="P2P-Intent.Link-2-Down"
               exec="onos-check-intent ${OC1} yx FAILED"/>
 
-        <dependency name="P2P-Intent.Link-1-Up"
+        <dependency name="P2P-Intent.ExpectExceptionMarkEnd"
                     requires="~P2P-Intent.Validate-Intent-XY-Failed,
-                              ~P2P-Intent.Validate-Intent-YX-Failed" />
+                              ~P2P-Intent.Validate-Intent-YX-Failed"/>
+
+        <dependency name="P2P-Intent.Link-1-Up"
+                    requires="~P2P-Intent.ExpectExceptionMarkEnd" />
 
         <step name="P2P-Intent.Validate-Intent-XY-Installed-Again" requires="P2P-Intent.Link-1-Up"
               exec="onos-check-intent ${OC1} xy INSTALLED"/>