diff options
| author | Vu Tran <vu.tran@windriver.com> | 2014-06-26 10:16:02 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-07-17 00:10:02 -0400 |
| commit | 506884b1969ee51e04fd21c7b89e1e7ba41e06e6 (patch) | |
| tree | b587808e7da2077ccd52c5ba675581c4ff3a4fe1 /meta-openstack/recipes-devtools/python | |
| parent | 3d35e4786d8bd2f552ed2d5cce61a28ecb81ddd9 (diff) | |
| download | meta-cloud-services-506884b1969ee51e04fd21c7b89e1e7ba41e06e6.tar.gz | |
neutron test: nec plugin extensions location
Some of the neutron built-in testcases failed
because they can not find nec plugin extensions
based on the given relative path.
So forcing these failure testcases to look for
these extensions using absolute path.
Signed-off-by: Vu Tran <vu.tran@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python')
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-neutron/neutron-test-nec-plugin-extensions-location.patch | 24 | ||||
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-neutron_git.bb | 3 |
2 files changed, 27 insertions, 0 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-neutron/neutron-test-nec-plugin-extensions-location.patch b/meta-openstack/recipes-devtools/python/python-neutron/neutron-test-nec-plugin-extensions-location.patch new file mode 100644 index 0000000..bf54c79 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python-neutron/neutron-test-nec-plugin-extensions-location.patch | |||
| @@ -0,0 +1,24 @@ | |||
| 1 | neutron test: nec plugin extensions location | ||
| 2 | |||
| 3 | Some of the neutron built-in testcases failed | ||
| 4 | because they can not find nec plugin extensions | ||
| 5 | based on the given the relative path. | ||
| 6 | |||
| 7 | So forcing these failure testcases to look for | ||
| 8 | these extensions using absolute path. | ||
| 9 | |||
| 10 | Signed-off-by: Vu Tran <vu.tran@windriver.com> | ||
| 11 | |||
| 12 | diff --git a/neutron/tests/unit/nec/test_nec_plugin.py b/neutron/tests/unit/nec/test_nec_plugin.py | ||
| 13 | index 2f913ca..1c3f0ce 100644 | ||
| 14 | --- a/neutron/tests/unit/nec/test_nec_plugin.py | ||
| 15 | +++ b/neutron/tests/unit/nec/test_nec_plugin.py | ||
| 16 | @@ -37,7 +37,7 @@ OFC_MANAGER = 'neutron.plugins.nec.nec_plugin.ofc_manager.OFCManager' | ||
| 17 | NOTIFIER = 'neutron.plugins.nec.nec_plugin.NECPluginV2AgentNotifierApi' | ||
| 18 | NEC_PLUGIN_INI = """ | ||
| 19 | [DEFAULT] | ||
| 20 | -api_extensions_path = neutron/plugins/nec/extensions | ||
| 21 | +api_extensions_path = %PYTHON_SITEPACKAGES_DIR%/neutron/plugins/nec/extensions | ||
| 22 | [OFC] | ||
| 23 | driver = neutron.tests.unit.nec.stub_ofc_driver.StubOFCDriver | ||
| 24 | enable_packet_filter = False | ||
diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb index 3973b63..c1c67d5 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb | |||
| @@ -17,6 +17,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \ | |||
| 17 | file://metadata_agent.ini \ | 17 | file://metadata_agent.ini \ |
| 18 | file://neutron-dhcp-agent-netns-cleanup.cron \ | 18 | file://neutron-dhcp-agent-netns-cleanup.cron \ |
| 19 | file://uuid_wscheck.patch \ | 19 | file://uuid_wscheck.patch \ |
| 20 | file://neutron-test-nec-plugin-extensions-location.patch \ | ||
| 20 | " | 21 | " |
| 21 | SRCREV="a8417d78c2675a2ceb5dbfcee70948a88d69e747" | 22 | SRCREV="a8417d78c2675a2ceb5dbfcee70948a88d69e747" |
| 22 | PV="2013.2.3+git${SRCPV}" | 23 | PV="2013.2.3+git${SRCPV}" |
| @@ -104,6 +105,8 @@ do_install_append() { | |||
| 104 | -i ${NEUTRON_CONF_DIR}/metadata_agent.ini | 105 | -i ${NEUTRON_CONF_DIR}/metadata_agent.ini |
| 105 | 106 | ||
| 106 | cp run_tests.sh ${NEUTRON_CONF_DIR} | 107 | cp run_tests.sh ${NEUTRON_CONF_DIR} |
| 108 | |||
| 109 | sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${D}${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}/tests/unit/nec/test_nec_plugin.py | ||
| 107 | } | 110 | } |
| 108 | 111 | ||
| 109 | pkg_postinst_${SRCNAME}-setup () { | 112 | pkg_postinst_${SRCNAME}-setup () { |
