Merge "fix some bugs for python verify jobs:"

author wenjuan dong <dong.wenjuan@zte.com.cn>

Thu, 27 Jul 2017 01:29:50 +0000 (01:29 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Thu, 27 Jul 2017 01:29:50 +0000 (01:29 +0000)
author wenjuan dong <dong.wenjuan@zte.com.cn>
Thu, 27 Jul 2017 01:29:50 +0000 (01:29 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Thu, 27 Jul 2017 01:29:50 +0000 (01:29 +0000)
diff --cc tests/main.py
Simple merge
diff --cc tests/run.sh
Simple merge
author	wenjuan dong <dong.wenjuan@zte.com.cn>
	Thu, 27 Jul 2017 01:29:50 +0000 (01:29 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Thu, 27 Jul 2017 01:29:50 +0000 (01:29 +0000)
		1	2
tests/main.py	patch \|	diff1 \|	diff2 \|	blob \| history
tests/run.sh	patch \|	diff1 \|	diff2 \|	blob \| history