summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools/python/python-nova/nova-fix-location-to-doc-directory.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-nova/nova-fix-location-to-doc-directory.patch')
-rw-r--r--meta-openstack/recipes-devtools/python/python-nova/nova-fix-location-to-doc-directory.patch46
1 files changed, 0 insertions, 46 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova-fix-location-to-doc-directory.patch b/meta-openstack/recipes-devtools/python/python-nova/nova-fix-location-to-doc-directory.patch
deleted file mode 100644
index 7893f87..0000000
--- a/meta-openstack/recipes-devtools/python/python-nova/nova-fix-location-to-doc-directory.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 4d74c926b8dd7eaac0c9ddac0d1161f634b69e1d Mon Sep 17 00:00:00 2001
2From: Keith Holman <Keith.Holman@windriver.com>
3Date: Tue, 17 Jun 2014 16:40:51 -0400
4Subject: [PATCH] nova: fix location to doc directory
5
6Currently, the tests included with nova expect the doc directory to be
7in the location they exist in the source tree. However, during system
8deployment the documentation is installed under the "nova" directory 1
9level higher in the directory tree. This patch fixes the relative
10path to be able to find the files.
11
12Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
13---
14 nova/tests/integrated/api_samples_test_base.py | 2 +-
15 nova/tests/integrated/v3/api_sample_base.py | 2 +-
16 2 files changed, 2 insertions(+), 2 deletions(-)
17
18diff --git a/nova/tests/integrated/api_samples_test_base.py b/nova/tests/integrated/api_samples_test_base.py
19index 6acb5a1..31caa6c 100644
20--- a/nova/tests/integrated/api_samples_test_base.py
21+++ b/nova/tests/integrated/api_samples_test_base.py
22@@ -88,7 +88,7 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase):
23 @classmethod
24 def _get_sample(cls, name):
25 dirname = os.path.dirname(os.path.abspath(__file__))
26- dirname = os.path.normpath(os.path.join(dirname, "../../../doc"))
27+ dirname = os.path.normpath(os.path.join(dirname, "../../doc"))
28 return cls._get_sample_path(name, dirname)
29
30 @classmethod
31diff --git a/nova/tests/integrated/v3/api_sample_base.py b/nova/tests/integrated/v3/api_sample_base.py
32index aa1ca8f..d22a2c8 100644
33--- a/nova/tests/integrated/v3/api_sample_base.py
34+++ b/nova/tests/integrated/v3/api_sample_base.py
35@@ -71,7 +71,7 @@ class ApiSampleTestBaseV3(api_samples_test_base.ApiSampleTestBase):
36 @classmethod
37 def _get_sample(cls, name):
38 dirname = os.path.dirname(os.path.abspath(__file__))
39- dirname = os.path.normpath(os.path.join(dirname, "../../../../doc/v3"))
40+ dirname = os.path.normpath(os.path.join(dirname, "../../../doc/v3"))
41 return cls._get_sample_path(name, dirname)
42
43 @classmethod
44--
451.9.3
46