From 8463c062909dba7367d56105cc56126ba971984e Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 14 May 2015 14:33:50 +0100 Subject: bitbake: tests/fetch: ensure fetch tests preserve current dir The fetcher calls os.chdir() in a number of places, which can affect other tests (since the directory it changes into gets deleted) - let's just put the current directory back to where it was when we're done. (This fixes bb.tests.Path.test_unsafe_delete_path failing if it was run as part of a full bitbake-selftest run, where the fetcher tests get to run before it.) (Bitbake rev: fdb6c123593fd2255b9b09e6bdf7306d64a82892) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- bitbake/lib/bb/tests/fetch.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bitbake/lib/bb/tests/fetch.py b/bitbake/lib/bb/tests/fetch.py index 262936139f..dc3429d1f2 100644 --- a/bitbake/lib/bb/tests/fetch.py +++ b/bitbake/lib/bb/tests/fetch.py @@ -315,6 +315,7 @@ class URITest(unittest.TestCase): class FetcherTest(unittest.TestCase): def setUp(self): + self.origdir = os.getcwd() self.d = bb.data.init() self.tempdir = tempfile.mkdtemp() self.dldir = os.path.join(self.tempdir, "download") @@ -326,6 +327,7 @@ class FetcherTest(unittest.TestCase): self.d.setVar("PERSISTENT_DIR", persistdir) def tearDown(self): + os.chdir(self.origdir) bb.utils.prunedir(self.tempdir) class MirrorUriTest(FetcherTest): -- cgit v1.2.3-54-g00ecf