Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sourcearchive: Pass target dirs to unpack methods

Browse Source 
This changes the internal API to make working with
multiple work dirs possible.
This commit is contained in:
Fatih Aşıcı
2011-02-20 14:30:02 +00:00
parent 67e18a7c92
commit 0262a6df57
4 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/archivetests.py
+7 -7
View File
@@ -13,8 +13,8 @@ class ArchiveTestCase(unittest.TestCase):
def testTarUnpack(self):
spec = SpecFile('repos/pardus-2007/system/base/curl/pspec.xml')
targetDir = '/tmp/tests'
archives = sourcearchive.SourceArchives(spec, targetDir)
archives.unpack()
archives = sourcearchive.SourceArchives(spec)
archives.unpack(targetDir)
for archive in spec.source.archive:
assert archive.type == 'targz'
@@ -22,7 +22,7 @@ class ArchiveTestCase(unittest.TestCase):
def testUnpackTarCond(self):
spec = SpecFile('repos/pardus-2007/system/base/curl/pspec.xml')
targetDir = '/tmp'
archives = sourcearchive.SourceArchives(spec, targetDir)
archives = sourcearchive.SourceArchives(spec)
for archive in spec.source.archive:
url = uri.URI(archive.uri)
filePath = join(pisi.context.config.archives_dir(), url.filename())
@@ -34,17 +34,17 @@ class ArchiveTestCase(unittest.TestCase):
def testZipUnpack(self):
spec = SpecFile('repos/pardus-2007/system/base/openssl/pspec.xml')
targetDir = '/tmp/tests'
archives = sourcearchive.SourceArchives(spec, targetDir)
archives = sourcearchive.SourceArchives(spec)
archives.fetch()
archives.unpack()
archives.unpack(targetDir)
assert not exists(targetDir + '/openssl')
def testMakeZip(self):
spec = SpecFile('repos/pardus-2007/system/base/openssl/pspec.xml')
targetDir = '/tmp/tests'
archives = sourcearchive.SourceArchives(spec, targetDir)
archives = sourcearchive.SourceArchives(spec)
archives.fetch(interactive = False)
archives.unpack(clean_dir = True)
archives.unpack(targetDir, clean_dir=True)
del archives
newDir = targetDir + '/newZip'
tests/srcarchivetest.py
+6 -8
View File
@@ -6,24 +6,22 @@ class SourceArchiveTestCase(unittest.TestCase):
def testFetch(self):
spec = SpecFile('repos/pardus-2007/system/base/curl/pspec.xml')
targetDir = '/tmp/tests'
srcarch = pisi.sourcearchive.SourceArchive(spec.source.archive[0], targetDir)
srcarch = pisi.sourcearchive.SourceArchive(spec.source.archive[0])
self.assert_(not srcarch.fetch())
def testIscached(self):
spec = SpecFile('repos/pardus-2007/system/base/curl/pspec.xml')
targetDir = '/tmp/tests'
srcarch = pisi.sourcearchive.SourceArchive(spec.source.archive[0], targetDir)
srcarch = pisi.sourcearchive.SourceArchive(spec.source.archive[0])
assert srcarch.is_cached()
def testIscached(self):
spec = SpecFile('repos/pardus-2007/system/base/curl/pspec.xml')
targetDir = '/tmp/tests'
srcarch = pisi.sourcearchive.SourceArchive(spec.source.archive[0], targetDir)
self.assert_(not srcarch.unpack())
srcarch = pisi.sourcearchive.SourceArchive(spec.source.archive[0])
self.assert_(not srcarch.unpack(targetDir))
def testUnpack(self):
spec = SpecFile('repos/pardus-2007/system/base/curl/pspec.xml')
targetDir = '/tmp/tests'
srcarch = pisi.sourcearchive.SourceArchive(spec.source.archive[0], targetDir)
srcarch.unpack()
srcarch = pisi.sourcearchive.SourceArchive(spec.source.archive[0])
srcarch.unpack(targetDir)