Merge "assert[Greater,Equal] -> assert_{,not_}called"

author Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>

Fri, 15 Jun 2018 08:41:37 +0000 (08:41 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Fri, 15 Jun 2018 08:41:37 +0000 (08:41 +0000)
author Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
Fri, 15 Jun 2018 08:41:37 +0000 (08:41 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Fri, 15 Jun 2018 08:41:37 +0000 (08:41 +0000)
diff --cc yardstick/tests/unit/network_services/vnf_generic/vnf/test_prox_helpers.py
Simple merge
author	Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
	Fri, 15 Jun 2018 08:41:37 +0000 (08:41 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Fri, 15 Jun 2018 08:41:37 +0000 (08:41 +0000)