diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-17 11:38:57 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-03 16:57:07 +0100 |
| commit | 32f72dbeef34612a729b06c9ce9e94072479b6fb (patch) | |
| tree | 422472cd97c32fd46d43820ee3d67ca0df7f5569 | |
| parent | 0c744479c2657e433280d9f1884483fa76796b69 (diff) | |
| download | bitbake-32f72dbeef34612a729b06c9ce9e94072479b6fb.tar.gz | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/tests/fetch.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index 46db7e5c6..8bf095cee 100644 --- a/lib/bb/tests/fetch.py +++ b/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) |