commit 9e7465e70ad406aa10f4d0a99211d5167015b629
author GlennRC <glenn@onlab.us> Fri Oct 02 13:50:36 2015 -0700
committer Glenn Contreras <glenn@onlab.us> Fri Oct 02 20:58:54 2015 +0000
tree 3c4d0bf30512e266f9498781ebc1dc5b460a9994
parent b8aa26d890028b77da2a8f9d9f6d77ea57468289

Fixed a minor bug

Change-Id: I269ab04bb73ee99472c4e3f3fe522731e92b2ad2

TestON/tests/CHOtest/CHOtest.params

diff --git a/TestON/tests/CHOtest/CHOtest.params b/TestON/tests/CHOtest/CHOtest.params
index 9175791..c090eb0 100644
--- a/TestON/tests/CHOtest/CHOtest.params
+++ b/TestON/tests/CHOtest/CHOtest.params
@@ -94,8 +94,8 @@
     </timers>
 
     <TEST>
-        <fail_switch>True</fail_switch>
-        <email>False</email>
+        <fail_switch>on</fail_switch>
+        <email>off</email>
         <intent_check>8</intent_check>
     </TEST>
 

TestON/tests/CHOtest/CHOtest.py

diff --git a/TestON/tests/CHOtest/CHOtest.py b/TestON/tests/CHOtest/CHOtest.py
index be409b8..45fddb1 100644
--- a/TestON/tests/CHOtest/CHOtest.py
+++ b/TestON/tests/CHOtest/CHOtest.py
@@ -33,12 +33,15 @@
         git_branch = main.params[ 'GIT' ][ 'branch' ]
         karafTimeout = main.params['CTRL']['karafCliTimeout']
         main.checkIntentsDelay = int( main.params['timers']['CheckIntentDelay'] )
-        main.failSwitch = bool( main.params['TEST']['fail_switch'] )
-        main.emailOnStop = bool( main.params['TEST']['email'] )
+        main.failSwitch = main.params['TEST']['fail_switch']
+        main.emailOnStop = main.params['TEST']['email']
         main.intentCheck = int( main.params['TEST']['intent_check'] )
         main.newTopo = ""
         main.CLIs = []
 
+        main.failSwitch = True if main.failSwitch == "on" else False
+        main.emailOnStop = True if main.emailOnStop == "on" else False
+
         for i in range( 1, int(main.numCtrls) + 1 ):
             main.CLIs.append( getattr( main, 'ONOScli' + str( i ) ) )
 
@@ -1819,7 +1822,7 @@
 
         if not caseResult and main.failSwitch:
             main.log.report("Stopping test")
-            main.stop( email=main.emailOnStop )
+            main.stop( mail=main.emailOnStop )
 
     def CASE72( self, main ):
         """