diff options
author | Keith Holman <Keith.Holman@windriver.com> | 2014-06-25 14:50:20 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-06-25 15:45:12 -0400 |
commit | 1b97b0a6f8695397d4ee1aa4b79585a70ca03788 (patch) | |
tree | ffed3d554cc065f5f7fff805bad8409be5ccc47a /meta-openstack/recipes-devtools/python/python-neutronclient_git.bb | |
parent | 6c6b36198dd307cae763bab498da9c3e9d2cf2ef (diff) | |
download | meta-cloud-services-1b97b0a6f8695397d4ee1aa4b79585a70ca03788.tar.gz |
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 <Keith.Holman@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-neutronclient_git.bb')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-neutronclient_git.bb | 4 |
1 files changed, 3 insertions, 1 deletions
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 \ | |||
20 | 20 | ||
21 | PR = "r0" | 21 | PR = "r0" |
22 | 22 | ||
23 | SRC_URI = "git://github.com/openstack/python-neutronclient.git;branch=master" | 23 | SRC_URI = "git://github.com/openstack/python-neutronclient.git;branch=master \ |
24 | file://neutronclient-use-csv-flag-instead-of-json.patch \ | ||
25 | " | ||
24 | 26 | ||
25 | PV="2.3.4+git${SRCPV}" | 27 | PV="2.3.4+git${SRCPV}" |
26 | SRCREV="663f8bd2cf5825ff587b2b10bf5d4a4bfc082534" | 28 | SRCREV="663f8bd2cf5825ff587b2b10bf5d4a4bfc082534" |