From 3d35e4786d8bd2f552ed2d5cce61a28ecb81ddd9 Mon Sep 17 00:00:00 2001 From: Keith Holman Date: Wed, 25 Jun 2014 14:50:20 -0400 Subject: neutronclient: use csv flag instead of json The tests included with neutronclient are calling neutron commands agents-list and net-list with the "-f" flag set to "json". This isn't supported and throws an exception during the test. The exception is unexpected and fails to free the resources allocated by the mox testing library causing the following tests to fail. This fix applies a patch that prevents the exception from being thrown by calling the commands with the "-f" flag set to "csv", which is supported. Signed-off-by: Keith Holman Signed-off-by: Bruce Ashfield --- meta-openstack/recipes-devtools/python/python-neutronclient_git.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta-openstack/recipes-devtools/python/python-neutronclient_git.bb') diff --git a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb index 753abcd..2e83208 100644 --- a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb @@ -20,7 +20,9 @@ RDEPENDS_${PN} +="python-cliff \ PR = "r0" -SRC_URI = "git://github.com/openstack/python-neutronclient.git;branch=master" +SRC_URI = "git://github.com/openstack/python-neutronclient.git;branch=master \ + file://neutronclient-use-csv-flag-instead-of-json.patch \ + " PV="2.3.4+git${SRCPV}" SRCREV="663f8bd2cf5825ff587b2b10bf5d4a4bfc082534" -- cgit v1.2.3-54-g00ecf