Merge pull request #1954 from nhumrich/master

Allow for user relative paths on EXTEND
This commit is contained in:
Aanand Prasad 2015-09-10 16:35:40 -07:00
commit 87a50317ad
2 changed files with 22 additions and 1 deletions

View File

@ -516,7 +516,7 @@ def split_label(label):
def expand_path(working_dir, path):
return os.path.abspath(os.path.join(working_dir, path))
return os.path.abspath(os.path.join(working_dir, os.path.expanduser(path)))
def to_list(value):

View File

@ -1032,6 +1032,27 @@ class ExtendsTest(unittest.TestCase):
self.assertEqual(dicts[0]['environment'], {'FOO': '1'})
class ExpandPathTest(unittest.TestCase):
working_dir = '/home/user/somedir'
def test_expand_path_normal(self):
result = config.expand_path(self.working_dir, 'myfile')
self.assertEqual(result, self.working_dir + '/' + 'myfile')
def test_expand_path_absolute(self):
abs_path = '/home/user/otherdir/somefile'
result = config.expand_path(self.working_dir, abs_path)
self.assertEqual(result, abs_path)
def test_expand_path_with_tilde(self):
test_path = '~/otherdir/somefile'
with mock.patch.dict(os.environ):
os.environ['HOME'] = user_path = '/home/user/'
result = config.expand_path(self.working_dir, test_path)
self.assertEqual(result, user_path + 'otherdir/somefile')
class BuildPathTest(unittest.TestCase):
def setUp(self):
self.abs_context_path = os.path.join(os.getcwd(), 'tests/fixtures/build-ctx')