diff options
author | Enrico Scholz <enrico.scholz@sigma-chemnitz.de> | 2013-02-11 20:21:52 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-11 22:45:25 +0000 |
commit | 8c22531e491e6b0cfffaaa80d6bc75db757fc1d1 (patch) | |
tree | 2d326aaea7250fac0e276500111c230cecbe971a /meta/lib/oe/tests/test_path.py | |
parent | d518019d6ccb0ffebe7e21b973eb4f9aa5241dec (diff) | |
download | poky-8c22531e491e6b0cfffaaa80d6bc75db757fc1d1.tar.gz |
lib/oe/path.py: support missing directory components in realpath()
Some use cases in OE operate on symlinks which dangling path components.
Assume that these are directories instead of raising ENOENT.
(From OE-Core rev: a96e2c84f24c15b77ee1fbc1f998b8b4796b8664)
Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/tests/test_path.py')
-rw-r--r-- | meta/lib/oe/tests/test_path.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/lib/oe/tests/test_path.py b/meta/lib/oe/tests/test_path.py index e6aa601618..3d41ce157a 100644 --- a/meta/lib/oe/tests/test_path.py +++ b/meta/lib/oe/tests/test_path.py | |||
@@ -25,7 +25,7 @@ class TestRealPath(unittest.TestCase): | |||
25 | ( "usr/bin/prog-F", "../../../sbin/prog-F", "/sbin/prog-F" ), | 25 | ( "usr/bin/prog-F", "../../../sbin/prog-F", "/sbin/prog-F" ), |
26 | ( "loop", "a/loop", None ), | 26 | ( "loop", "a/loop", None ), |
27 | ( "a/loop", "../loop", None ), | 27 | ( "a/loop", "../loop", None ), |
28 | ( "b/test", "file/foo", None ), | 28 | ( "b/test", "file/foo", "/b/file/foo" ), |
29 | ] | 29 | ] |
30 | 30 | ||
31 | LINKS_PHYS = [ | 31 | LINKS_PHYS = [ |
@@ -59,8 +59,9 @@ class TestRealPath(unittest.TestCase): | |||
59 | for l in self.LINKS: | 59 | for l in self.LINKS: |
60 | os.symlink(l[1], os.path.join(self.root, l[0])) | 60 | os.symlink(l[1], os.path.join(self.root, l[0])) |
61 | 61 | ||
62 | def __realpath(self, file, use_physdir): | 62 | def __realpath(self, file, use_physdir, assume_dir = True): |
63 | return oe.path.realpath(os.path.join(self.root, file), self.root, use_physdir) | 63 | return oe.path.realpath(os.path.join(self.root, file), self.root, |
64 | use_physdir, assume_dir = assume_dir) | ||
64 | 65 | ||
65 | def test_norm(self): | 66 | def test_norm(self): |
66 | for l in self.LINKS: | 67 | for l in self.LINKS: |
@@ -85,5 +86,4 @@ class TestRealPath(unittest.TestCase): | |||
85 | def test_loop(self): | 86 | def test_loop(self): |
86 | for e in self.EXCEPTIONS: | 87 | for e in self.EXCEPTIONS: |
87 | self.assertRaisesRegexp(OSError, r'\[Errno %u\]' % e[1], | 88 | self.assertRaisesRegexp(OSError, r'\[Errno %u\]' % e[1], |
88 | self.__realpath, e[0], False) | 89 | self.__realpath, e[0], False, False) |
89 | |||