Merge "assertTrue(mock.called) -> mock.assert_called"

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

Mon, 12 Mar 2018 09:53:40 +0000 (09:53 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Mon, 12 Mar 2018 09:53:40 +0000 (09:53 +0000)
author Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
Mon, 12 Mar 2018 09:53:40 +0000 (09:53 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Mon, 12 Mar 2018 09:53:40 +0000 (09:53 +0000)
diff --cc yardstick/tests/unit/benchmark/contexts/test_heat.py
Simple merge
author	Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
	Mon, 12 Mar 2018 09:53:40 +0000 (09:53 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Mon, 12 Mar 2018 09:53:40 +0000 (09:53 +0000)