Merge "Consider criteria as exit condition in odl test"

author Morgan Richomme <morgan.richomme@orange.com>

Fri, 25 Nov 2016 07:04:56 +0000 (07:04 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Fri, 25 Nov 2016 07:04:56 +0000 (07:04 +0000)
author Morgan Richomme <morgan.richomme@orange.com>
Fri, 25 Nov 2016 07:04:56 +0000 (07:04 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Fri, 25 Nov 2016 07:04:56 +0000 (07:04 +0000)
diff --cc functest/opnfv_tests/Controllers/ODL/OpenDaylightTesting.py
Simple merge
diff --cc functest/tests/unit/odl/test_odl.py
Simple merge
author	Morgan Richomme <morgan.richomme@orange.com>
	Fri, 25 Nov 2016 07:04:56 +0000 (07:04 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Fri, 25 Nov 2016 07:04:56 +0000 (07:04 +0000)
		1	2
functest/opnfv_tests/Controllers/ODL/OpenDaylightTesting.py	patch \|	diff1 \|	diff2 \|	blob \| history
functest/tests/unit/odl/test_odl.py	patch \|	diff1 \|	diff2 \|	blob \| history