summaryrefslogtreecommitdiffstats
path: root/snaps/tests
diff options
context:
space:
mode:
authorspisarski <s.pisarski@cablelabs.com>2017-06-07 14:56:00 -0600
committerspisarski <s.pisarski@cablelabs.com>2017-06-07 14:56:00 -0600
commit95d35a166fc66944fb0fc6091f4b84568aef0e7d (patch)
tree5ad804fe917c7c7a2bcf99ad285159ea0f29d015 /snaps/tests
parentc8212122569c2dbf6290b43a0fbde0171c2ffdc5 (diff)
Removed current working directory logic retrieving test file resources.
Some of the SNAPS tests leverage file resources contained within the project. These resources were being accessed via relative paths which required the test clients to ensure that the CWD was the <repo>/snaps directory. Replaced that logic to leverage the import pkg_resources making the tests much more flexible and robust. JIRA: SNAPS-89 Change-Id: Ic9c429ee53e4dd785641e11e1ed4de5aeeab54d1 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/tests')
-rw-r--r--snaps/tests/file_utils_tests.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/snaps/tests/file_utils_tests.py b/snaps/tests/file_utils_tests.py
index a28231b..62d96e8 100644
--- a/snaps/tests/file_utils_tests.py
+++ b/snaps/tests/file_utils_tests.py
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import os
+import pkg_resources
import unittest
import shutil
import uuid
@@ -95,7 +96,8 @@ class FileUtilsTests(unittest.TestCase):
Tests that the OS Environment file is correctly parsed
:return:
"""
- os_env_dict = file_utils.read_os_env_file('openstack/tests/conf/overcloudrc_test')
+ rc_file_path = pkg_resources.resource_filename('snaps.openstack.tests.conf', 'overcloudrc_test')
+ os_env_dict = file_utils.read_os_env_file(rc_file_path)
self.assertEqual('test_pw', os_env_dict['OS_PASSWORD'])
self.assertEqual('http://foo:5000/v2.0/', os_env_dict['OS_AUTH_URL'])
self.assertEqual('admin', os_env_dict['OS_USERNAME'])