diff options
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-horizon')
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-horizon/horizon-use-full-package-path-to-test-directories.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-horizon/horizon-use-full-package-path-to-test-directories.patch b/meta-openstack/recipes-devtools/python/python-horizon/horizon-use-full-package-path-to-test-directories.patch new file mode 100644 index 0000000..e5e1966 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python-horizon/horizon-use-full-package-path-to-test-directories.patch | |||
| @@ -0,0 +1,39 @@ | |||
| 1 | From 89aa2a575687013f4b4f4d4353c50af1de4c26ba Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Keith Holman <Keith.Holman@windriver.com> | ||
| 3 | Date: Fri, 30 May 2014 11:58:33 -0400 | ||
| 4 | Subject: [PATCH] horizon: use full package path to test directories | ||
| 5 | |||
| 6 | The tests included Horizon expect all files to be in a single | ||
| 7 | location in order to be run directly from the source tree. The | ||
| 8 | recipe for installing Horizon on the system installs Horizon | ||
| 9 | as a python site-package and puts files in different locations | ||
| 10 | depending on the file type. In order to have the tests support | ||
| 11 | this type of install we need to explicitly indicate the full path | ||
| 12 | of the test files to exclude in order to have the tests run | ||
| 13 | successfully. This fix adds an identifier that will be replaced | ||
| 14 | within the build recipe with the full path to the python site | ||
| 15 | packages. | ||
| 16 | |||
| 17 | Signed-off-by: Keith Holman <Keith.Holman@windriver.com> | ||
| 18 | --- | ||
| 19 | horizon/test/settings.py | 4 ++-- | ||
| 20 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 21 | |||
| 22 | diff --git a/horizon/test/settings.py b/horizon/test/settings.py | ||
| 23 | index f5ea700..10318eb 100644 | ||
| 24 | --- a/horizon/test/settings.py | ||
| 25 | +++ b/horizon/test/settings.py | ||
| 26 | @@ -95,8 +95,8 @@ SITE_BRANDING = 'Horizon' | ||
| 27 | TEST_RUNNER = 'django_nose.NoseTestSuiteRunner' | ||
| 28 | NOSE_ARGS = ['--nocapture', | ||
| 29 | '--nologcapture', | ||
| 30 | - '--exclude-dir=horizon/conf/', | ||
| 31 | - '--exclude-dir=horizon/test/customization', | ||
| 32 | + '--exclude-dir=%PYTHON_SITEPACKAGES%/horizon/conf/', | ||
| 33 | + '--exclude-dir=%PYTHON_SITEPACKAGES%/horizon/test/customization', | ||
| 34 | '--cover-package=horizon', | ||
| 35 | '--cover-inclusive', | ||
| 36 | '--all-modules'] | ||
| 37 | -- | ||
| 38 | 1.9.3 | ||
| 39 | |||
