commit 33a64679d2ff30b5f9ffe673108259407b4e9c9c
author Hari Krishna <hari@onlab.us> Tue Feb 17 16:56:17 2015 -0800
committer Hari Krishna <hari@onlab.us> Tue Feb 17 16:56:17 2015 -0800
tree 9c5a81638e3ae8718f4b03835cf83488adea6762
parent 22c3d41e103580402fbc6ee5d8b2356fc2798c36
parent 1c7509b87a65d457eaf41f5551e560f1aa2ea0df

Merge branch 'OnosCHO' of https://github.com/OPENNETWORKINGLAB/ONLabTest into OnosCHO

Conflicts:
	TestON/drivers/common/cli/onosclidriver.py
	TestON/tests/OnosCHO/OnosCHO.params
	TestON/tests/OnosCHO/OnosCHO.py

TestON/drivers/common/cli/onosclidriver.py

diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 5deb911..a660caa 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -901,9 +901,12 @@
                            str( hostIdOne ) + " and " + str( hostIdTwo ) )
                 return main.TRUE
 
+<<<<<<< HEAD
         except TypeError:
             main.log.exception( self.name + ": Object not as expected" )
             return None
+=======
+>>>>>>> 1c7509b87a65d457eaf41f5551e560f1aa2ea0df
         except pexpect.EOF:
             main.log.error( self.name + ": EOF exception found" )
             main.log.error( self.name + ":    " + self.handle.before )