diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-11 10:36:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-11 10:36:21 +0000 |
| commit | 6c79b752b620a5859d3becb483df9bffcef275d3 (patch) | |
| tree | 5dd93828e308234eda4e7cd60aacfe4c35cdd79a /nova/tests/integrated | |
| parent | a79eea05db0e907c3f942fd8380f238aa34b8f2b (diff) | |
| parent | 659d7730baa9f8702914b7e084aafb0e99fb48f5 (diff) | |
| download | nova-6c79b752b620a5859d3becb483df9bffcef275d3.tar.gz nova-6c79b752b620a5859d3becb483df9bffcef275d3.tar.xz nova-6c79b752b620a5859d3becb483df9bffcef275d3.zip | |
Merge "Normalize path for finding api_samples dir"
Diffstat (limited to 'nova/tests/integrated')
| -rw-r--r-- | nova/tests/integrated/test_api_samples.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index 7ac0d2633..69f23f036 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -153,7 +153,7 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase): @classmethod def _get_sample(cls, name): dirname = os.path.dirname(os.path.abspath(__file__)) - dirname = os.path.join(dirname, "../../../doc") + dirname = os.path.normpath(os.path.join(dirname, "../../../doc")) return cls._get_sample_path(name, dirname) @classmethod |