mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 00:59:48 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: test/fetch: Allow the conditional network tests to work under python 2.6

Browse Source 
The skipIf decorator is unavailable under python 2.6 and finding a syntax
works there is hard. This patch does allow network tests under 2.6.

(Bitbake rev: bc92d9f1d704a92275f3117fead84b8ac4a68987)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2013-05-17 12:41:04 +03:00
parent 9643fbc28a
commit 0cf150a398
1 changed files with 80 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/tests/fetch.py
+80 -90
View File
@@ -251,8 +251,23 @@ class URITest(unittest.TestCase):
self.assertEqual(uri.params, {}) self.assertEqual(uri.params, {})
self.assertEqual(str(uri), (str(uri).split(";"))[0]) self.assertEqual(str(uri), (str(uri).split(";"))[0])
class FetcherTest(unittest.TestCase):
class FetcherUriTest(unittest.TestCase): def setUp(self):
self.d = bb.data.init()
self.tempdir = tempfile.mkdtemp()
self.dldir = os.path.join(self.tempdir, "download")
os.mkdir(self.dldir)
self.d.setVar("DL_DIR", self.dldir)
self.unpackdir = os.path.join(self.tempdir, "unpacked")
os.mkdir(self.unpackdir)
persistdir = os.path.join(self.tempdir, "persistdata")
self.d.setVar("PERSISTENT_DIR", persistdir)
def tearDown(self):
bb.utils.prunedir(self.tempdir)
class MirrorUriTest(FetcherTest):
replaceuris = { replaceuris = {
("git://git.invalid.infradead.org/mtd-utils.git;tag=1234567890123456789012345678901234567890", "git://.*/.*", "http://somewhere.org/somedir/") ("git://git.invalid.infradead.org/mtd-utils.git;tag=1234567890123456789012345678901234567890", "git://.*/.*", "http://somewhere.org/somedir/")
@@ -315,102 +330,77 @@ class FetcherUriTest(unittest.TestCase):
uris, uds = bb.fetch2.build_mirroruris(fetcher, mirrors, self.d) uris, uds = bb.fetch2.build_mirroruris(fetcher, mirrors, self.d)
self.assertEqual(uris, ['file:///someotherpath/downloads/bitbake-1.0.tar.gz']) self.assertEqual(uris, ['file:///someotherpath/downloads/bitbake-1.0.tar.gz'])
class FetcherTest(unittest.TestCase): class FetcherNetworkTest(FetcherTest):
def setUp(self): if os.environ.get("BB_SKIP_NETTESTS") == "yes":
self.d = bb.data.init() print("Unset BB_SKIP_NETTESTS to run network tests")
self.tempdir = tempfile.mkdtemp() else:
self.dldir = os.path.join(self.tempdir, "download") def test_fetch(self):
os.mkdir(self.dldir) fetcher = bb.fetch.Fetch(["http://downloads.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz", "http://downloads.yoctoproject.org/releases/bitbake/bitbake-1.1.tar.gz"], self.d)
self.d.setVar("DL_DIR", self.dldir) fetcher.download()
self.unpackdir = os.path.join(self.tempdir, "unpacked") self.assertEqual(os.path.getsize(self.dldir + "/bitbake-1.0.tar.gz"), 57749)
os.mkdir(self.unpackdir) self.assertEqual(os.path.getsize(self.dldir + "/bitbake-1.1.tar.gz"), 57892)
persistdir = os.path.join(self.tempdir, "persistdata") self.d.setVar("BB_NO_NETWORK", "1")
self.d.setVar("PERSISTENT_DIR", persistdir) fetcher = bb.fetch.Fetch(["http://downloads.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz", "http://downloads.yoctoproject.org/releases/bitbake/bitbake-1.1.tar.gz"], self.d)
fetcher.download()
def tearDown(self):
bb.utils.prunedir(self.tempdir)
@unittest.skipIf(os.environ.get("BB_SKIP_NETTESTS") == "yes",
"Unset BB_SKIP_NETTESTS to run network tests")
def test_fetch(self):
fetcher = bb.fetch.Fetch(["http://downloads.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz", "http://downloads.yoctoproject.org/releases/bitbake/bitbake-1.1.tar.gz"], self.d)
fetcher.download()
self.assertEqual(os.path.getsize(self.dldir + "/bitbake-1.0.tar.gz"), 57749)
self.assertEqual(os.path.getsize(self.dldir + "/bitbake-1.1.tar.gz"), 57892)
self.d.setVar("BB_NO_NETWORK", "1")
fetcher = bb.fetch.Fetch(["http://downloads.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz", "http://downloads.yoctoproject.org/releases/bitbake/bitbake-1.1.tar.gz"], self.d)
fetcher.download()
fetcher.unpack(self.unpackdir)
self.assertEqual(len(os.listdir(self.unpackdir + "/bitbake-1.0/")), 9)
self.assertEqual(len(os.listdir(self.unpackdir + "/bitbake-1.1/")), 9)
@unittest.skipIf(os.environ.get("BB_SKIP_NETTESTS") == "yes",
"Unset BB_SKIP_NETTESTS to run network tests")
def test_fetch_mirror(self):
self.d.setVar("MIRRORS", "http://.*/.* http://downloads.yoctoproject.org/releases/bitbake")
fetcher = bb.fetch.Fetch(["http://invalid.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz"], self.d)
fetcher.download()
self.assertEqual(os.path.getsize(self.dldir + "/bitbake-1.0.tar.gz"), 57749)
@unittest.skipIf(os.environ.get("BB_SKIP_NETTESTS") == "yes",
"Unset BB_SKIP_NETTESTS to run network tests")
def test_fetch_premirror(self):
self.d.setVar("PREMIRRORS", "http://.*/.* http://downloads.yoctoproject.org/releases/bitbake")
fetcher = bb.fetch.Fetch(["http://invalid.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz"], self.d)
fetcher.download()
self.assertEqual(os.path.getsize(self.dldir + "/bitbake-1.0.tar.gz"), 57749)
def gitfetcher(self, url1, url2):
def checkrevision(self, fetcher):
fetcher.unpack(self.unpackdir) fetcher.unpack(self.unpackdir)
revision = bb.process.run("git rev-parse HEAD", shell=True, cwd=self.unpackdir + "/git")[0].strip() self.assertEqual(len(os.listdir(self.unpackdir + "/bitbake-1.0/")), 9)
self.assertEqual(revision, "270a05b0b4ba0959fe0624d2a4885d7b70426da5") self.assertEqual(len(os.listdir(self.unpackdir + "/bitbake-1.1/")), 9)
self.d.setVar("BB_GENERATE_MIRROR_TARBALLS", "1") def test_fetch_mirror(self):
self.d.setVar("SRCREV", "270a05b0b4ba0959fe0624d2a4885d7b70426da5") self.d.setVar("MIRRORS", "http://.*/.* http://downloads.yoctoproject.org/releases/bitbake")
fetcher = bb.fetch.Fetch([url1], self.d) fetcher = bb.fetch.Fetch(["http://invalid.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz"], self.d)
fetcher.download() fetcher.download()
checkrevision(self, fetcher) self.assertEqual(os.path.getsize(self.dldir + "/bitbake-1.0.tar.gz"), 57749)
# Wipe out the dldir clone and the unpacked source, turn off the network and check mirror tarball works
bb.utils.prunedir(self.dldir + "/git2/")
bb.utils.prunedir(self.unpackdir)
self.d.setVar("BB_NO_NETWORK", "1")
fetcher = bb.fetch.Fetch([url2], self.d)
fetcher.download()
checkrevision(self, fetcher)
@unittest.skipIf(os.environ.get("BB_SKIP_NETTESTS") == "yes", def test_fetch_premirror(self):
"Unset BB_SKIP_NETTESTS to run network tests") self.d.setVar("PREMIRRORS", "http://.*/.* http://downloads.yoctoproject.org/releases/bitbake")
def test_gitfetch(self): fetcher = bb.fetch.Fetch(["http://invalid.yoctoproject.org/releases/bitbake/bitbake-1.0.tar.gz"], self.d)
url1 = url2 = "git://git.openembedded.org/bitbake" fetcher.download()
self.gitfetcher(url1, url2) self.assertEqual(os.path.getsize(self.dldir + "/bitbake-1.0.tar.gz"), 57749)
@unittest.skipIf(os.environ.get("BB_SKIP_NETTESTS") == "yes", def gitfetcher(self, url1, url2):
"Unset BB_SKIP_NETTESTS to run network tests") def checkrevision(self, fetcher):
def test_gitfetch_premirror(self): fetcher.unpack(self.unpackdir)
url1 = "git://git.openembedded.org/bitbake" revision = bb.process.run("git rev-parse HEAD", shell=True, cwd=self.unpackdir + "/git")[0].strip()
url2 = "git://someserver.org/bitbake" self.assertEqual(revision, "270a05b0b4ba0959fe0624d2a4885d7b70426da5")
self.d.setVar("PREMIRRORS", "git://someserver.org/bitbake git://git.openembedded.org/bitbake \n")
self.gitfetcher(url1, url2)
@unittest.skipIf(os.environ.get("BB_SKIP_NETTESTS") == "yes", self.d.setVar("BB_GENERATE_MIRROR_TARBALLS", "1")
"Unset BB_SKIP_NETTESTS to run network tests") self.d.setVar("SRCREV", "270a05b0b4ba0959fe0624d2a4885d7b70426da5")
def test_gitfetch_premirror2(self): fetcher = bb.fetch.Fetch([url1], self.d)
url1 = url2 = "git://someserver.org/bitbake" fetcher.download()
self.d.setVar("PREMIRRORS", "git://someserver.org/bitbake git://git.openembedded.org/bitbake \n") checkrevision(self, fetcher)
self.gitfetcher(url1, url2) # Wipe out the dldir clone and the unpacked source, turn off the network and check mirror tarball works
bb.utils.prunedir(self.dldir + "/git2/")
bb.utils.prunedir(self.unpackdir)
self.d.setVar("BB_NO_NETWORK", "1")
fetcher = bb.fetch.Fetch([url2], self.d)
fetcher.download()
checkrevision(self, fetcher)
@unittest.skipIf(os.environ.get("BB_SKIP_NETTESTS") == "yes", def test_gitfetch(self):
"Unset BB_SKIP_NETTESTS to run network tests") url1 = url2 = "git://git.openembedded.org/bitbake"
def test_gitfetch_premirror3(self): self.gitfetcher(url1, url2)
realurl = "git://git.openembedded.org/bitbake"
dummyurl = "git://someserver.org/bitbake" def test_gitfetch_premirror(self):
self.sourcedir = self.unpackdir.replace("unpacked", "sourcemirror.git") url1 = "git://git.openembedded.org/bitbake"
os.chdir(self.tempdir) url2 = "git://someserver.org/bitbake"
bb.process.run("git clone %s %s 2> /dev/null" % (realurl, self.sourcedir), shell=True) self.d.setVar("PREMIRRORS", "git://someserver.org/bitbake git://git.openembedded.org/bitbake \n")
self.d.setVar("PREMIRRORS", "%s git://%s;protocol=file \n" % (dummyurl, self.sourcedir)) self.gitfetcher(url1, url2)
self.gitfetcher(dummyurl, dummyurl)
def test_gitfetch_premirror2(self):
url1 = url2 = "git://someserver.org/bitbake"
self.d.setVar("PREMIRRORS", "git://someserver.org/bitbake git://git.openembedded.org/bitbake \n")
self.gitfetcher(url1, url2)
def test_gitfetch_premirror3(self):
realurl = "git://git.openembedded.org/bitbake"
dummyurl = "git://someserver.org/bitbake"
self.sourcedir = self.unpackdir.replace("unpacked", "sourcemirror.git")
os.chdir(self.tempdir)
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)
class URLHandle(unittest.TestCase): class URLHandle(unittest.TestCase):