commit 97a62b3ba8b3ad0cafe80077ca025e7d0717171f
author Eric Newberry <enewberry@email.arizona.edu> Mon Aug 01 18:13:39 2016 -0700
committer Eric Newberry <enewberry@email.arizona.edu> Wed Aug 03 13:41:28 2016 -0700
tree 122b668b62e6e0979de0eaef1efca4f1e2f9dd4e
parent c2d29ff04ec2742c36e1fe6970a88feb384f5f43

Correct Exclude usage in FIB matching scenario

refs #3693

Change-Id: Ia9714b79a60e0d4c47f6135601827b6eb3ebb919

test_fib_matching/test_fib_matching.py

diff --git a/test_fib_matching/test_fib_matching.py b/test_fib_matching/test_fib_matching.py
index 0570f64..55c4788 100644
--- a/test_fib_matching/test_fib_matching.py
+++ b/test_fib_matching/test_fib_matching.py
@@ -205,14 +205,14 @@
         #Wait 100ms
         time.sleep(0.1)
 
-        #Invoke ndn-traffic to request ndn:/D MustBeFresh=yes Exclude=[,D]
+        #Invoke ndn-traffic to request ndn:/D MustBeFresh=yes Exclude=[...,D]
         #Fail if unanswered. Fail if Content is not "Z".
         clientConfigurationFile = os.path.abspath(
             "test_fib_matching/test-traffic-client-9.conf")
         self.startProcess("ndn-traffic-client-9",
             ["ndn-traffic", "-c 1", clientConfigurationFile],
             ("-> Starting Traffic Client 9 (Prefix=ndn:/D, MustBeFresh=Yes,"
-             " ExcludeBefore=D, ExpectedContent=Z)"))
+             " ExcludeRange=...,D, ExpectedContent=Z)"))
         self.waitForProcessCompletion("ndn-traffic-client-9", 10)
         self.checkAndReportFailure("ndn-traffic-client-9", "Traffic Client 9")
         print "-> Traffic Client 9 received data with Content=Z"
@@ -220,14 +220,14 @@
         #Wait 100ms
         time.sleep(0.1)
 
-        #Invoke ndn-traffic to request ndn:/D MustBeFresh=yes Exclude=[,E].
+        #Invoke ndn-traffic to request ndn:/D MustBeFresh=yes Exclude=[...,E]
         #Fail if unanswered. Fail if Content is not "Z".
         clientConfigurationFile = os.path.abspath(
             "test_fib_matching/test-traffic-client-10.conf")
         self.startProcess("ndn-traffic-client-10",
             ["ndn-traffic", "-c 1", clientConfigurationFile],
             ("-> Starting Traffic Client 10 (Prefix=ndn:/E, MustBeFresh=Yes,"
-             " ExcludeBefore=E, ExpectedContent=Z)"))
+             " ExcludeRange=...,E, ExpectedContent=Z)"))
         self.waitForProcessCompletion("ndn-traffic-client-10", 10)
         self.checkAndReportFailure("ndn-traffic-client-10", "Traffic Client 10")
         print "-> Traffic Client 10 received data with Content=Z"