From 0a52bdfb9a63a0cc5654406f98b5bbcd2de3aad8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 17 May 2013 11:38:57 +0300 Subject: bitbake: tests/fetch: Allow to work on python 2.6 Currently the fetch tests fail on python 2.6 since check_output doesn't exist on this version of python. Use bb.process instead to avoid this problem. (Bitbake rev: a3637155e829e06bbfe50fb8753de3de7ee8c22e) Signed-off-by: Richard Purdie --- bitbake/lib/bb/tests/fetch.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bitbake/lib/bb') diff --git a/bitbake/lib/bb/tests/fetch.py b/bitbake/lib/bb/tests/fetch.py index 46db7e5c60..8bf095ceea 100644 --- a/bitbake/lib/bb/tests/fetch.py +++ b/bitbake/lib/bb/tests/fetch.py @@ -341,7 +341,7 @@ class FetcherTest(unittest.TestCase): def gitfetcher(self, url1, url2): def checkrevision(self, fetcher): fetcher.unpack(self.unpackdir) - revision = subprocess.check_output("git rev-parse HEAD", shell=True, cwd=self.unpackdir + "/git").strip() + revision = bb.process.run("git rev-parse HEAD", shell=True, cwd=self.unpackdir + "/git")[0].strip() self.assertEqual(revision, "270a05b0b4ba0959fe0624d2a4885d7b70426da5") self.d.setVar("BB_GENERATE_MIRROR_TARBALLS", "1") @@ -385,7 +385,7 @@ class FetcherTest(unittest.TestCase): dummyurl = "git://someserver.org/bitbake" self.sourcedir = self.unpackdir.replace("unpacked", "sourcemirror.git") os.chdir(self.tempdir) - subprocess.check_output("git clone %s %s 2> /dev/null" % (realurl, self.sourcedir), shell=True) + bb.process.run("git clone %s %s 2> /dev/null" % (realurl, self.sourcedir), shell=True) self.d.setVar("PREMIRRORS", "%s git://%s;protocol=file \n" % (dummyurl, self.sourcedir)) self.gitfetcher(dummyurl, dummyurl) -- cgit v1.2.3-54-g00ecf