Add python3 support

This commit is contained in:
Safa Ariman
2019-06-06 01:31:19 +03:00
parent 68344a2d87
commit c90351220c
146 changed files with 806 additions and 1082 deletions
+1 -1
View File
@@ -8,7 +8,7 @@ class ConstantTestCase(unittest.TestCase):
constants = ctx.const
constDict = {"actions": "actions.py", "setup":"setup","metadata":"metadata.xml"}
for i in constDict.keys():
for i in list(constDict.keys()):
if hasattr(constants,i):
value = getattr(constants,i)
self.assertEqual(value, constDict[i])
+1 -1
View File
@@ -10,7 +10,7 @@
# Please read the COPYING file.
#
import testcase
from . import testcase
import pisi
class ComponentDBTestCase(testcase.TestCase):
+1 -1
View File
@@ -10,7 +10,7 @@
# Please read the COPYING file.
#
import testcase
from . import testcase
import pisi
class FilesDBTestCase(testcase.TestCase):
+2 -2
View File
@@ -10,7 +10,7 @@
# Please read the COPYING file.
#
import testcase
from . import testcase
import pisi
class InstallDBTestCase(testcase.TestCase):
@@ -69,7 +69,7 @@ class InstallDBTestCase(testcase.TestCase):
pisi.api.install(["ctorrent"])
self.installdb = pisi.db.installdb.InstallDB()
revdeps = self.installdb.get_rev_deps("openssl")
assert set(["ctorrent", "curl"]) == set(map(lambda x:x[0], revdeps))
assert set(["ctorrent", "curl"]) == set([x[0] for x in revdeps])
def testAddRemovePackage(self):
pisi.api.install(["ctorrent"])
+1 -1
View File
@@ -10,7 +10,7 @@
# Please read the COPYING file.
#
import testcase
from . import testcase
import pisi.db.itembyrepo
class TestDB:
+2 -2
View File
@@ -26,12 +26,12 @@ class LazyDBTestCase(unittest.TestCase):
def testDatabaseMethodForcingInit(self):
db = TestDB()
assert db.getTestField()
assert db.__dict__.has_key("testfield")
assert "testfield" in db.__dict__
db._delete()
def testDatabaseWithoutInit(self):
db = TestDB()
assert not db.__dict__.has_key("testfield")
assert "testfield" not in db.__dict__
db._delete()
def testSingletonBehaviour(self):
+1 -1
View File
@@ -10,7 +10,7 @@
# Please read the COPYING file.
#
import testcase
from . import testcase
import pisi
class PackageDBTestCase(testcase.TestCase):
+1 -1
View File
@@ -10,7 +10,7 @@
# Please read the COPYING file.
#
import testcase
from . import testcase
import pisi
class RepoDBTestCase(testcase.TestCase):
+1 -1
View File
@@ -10,7 +10,7 @@
# Please read the COPYING file.
#
import testcase
from . import testcase
import pisi
class SourceDBTestCase(testcase.TestCase):
+8 -8
View File
@@ -11,23 +11,23 @@ class FileTestCase(unittest.TestCase):
def testMakeUri(self):
spec = SpecFile("repos/pardus-2007/system/base/curl/pspec.xml")
url = uri.URI(spec.source.archive[0].uri)
self.assert_(File.make_uri(url))
self.assertTrue(File.make_uri(url))
def testChooseMethod(self):
compress = File('repos/contrib-2007/pisi-index.xml', File.read)
self.assert_(File.choose_method('pisi.conf', compress))
compress = open('repos/contrib-2007/pisi-index.xml', File.read)
self.assertTrue(File.choose_method('pisi.conf', compress))
def testDecompress(self):
localfile = File('repos/pardus-2007/system/base/curl/pspec.xml', File.read)
compress = File('repos/contrib-2007/pisi-index.xml', File.read)
self.assert_(File.decompress(localfile,compress))
localfile = open('repos/pardus-2007/system/base/curl/pspec.xml', File.read)
compress = open('repos/contrib-2007/pisi-index.xml', File.read)
self.assertTrue(File.decompress(localfile,compress))
def testLocalFile(self):
f = File('repos/pardus-2007/system/base/curl/pspec.xml', File.read)
f = open('repos/pardus-2007/system/base/curl/pspec.xml', File.read)
r = f.readlines()
assert (len(r) > 0)
def testRemoteRead(self):
f = File('http://www.gnu.org/licenses/gpl2.txt', File.read)
f = open('http://www.gnu.org/licenses/gpl2.txt', File.read)
r = f.readlines()
assert (len(r) > 0)
+1 -1
View File
@@ -13,7 +13,7 @@ class ReplaceTestCase(unittest.TestCase):
replace = pisi.replace.Replace(relation)
replace.package = "zlib"
# Check if the replaced package is installed
self.assert_(pisi.replace.installed_package_replaced(replace))
self.assertTrue(pisi.replace.installed_package_replaced(replace))
repinfo = pisi.replace.Replace(relation)
repinfo.package = "ctorrent"
assert not pisi.replace.installed_package_replaced(repinfo)
+2 -2
View File
@@ -7,7 +7,7 @@ class SourceArchiveTestCase(unittest.TestCase):
def testFetch(self):
spec = SpecFile('repos/pardus-2007/system/base/curl/pspec.xml')
srcarch = pisi.sourcearchive.SourceArchive(spec.source.archive[0])
self.assert_(not srcarch.fetch())
self.assertTrue(not srcarch.fetch())
def testIscached(self):
spec = SpecFile('repos/pardus-2007/system/base/curl/pspec.xml')
@@ -18,7 +18,7 @@ class SourceArchiveTestCase(unittest.TestCase):
spec = SpecFile('repos/pardus-2007/system/base/curl/pspec.xml')
targetDir = '/tmp/tests'
srcarch = pisi.sourcearchive.SourceArchive(spec.source.archive[0])
self.assert_(not srcarch.unpack(targetDir))
self.assertTrue(not srcarch.unpack(targetDir))
def testUnpack(self):
spec = SpecFile('repos/pardus-2007/system/base/curl/pspec.xml')
+3 -3
View File
@@ -27,9 +27,9 @@ class UtilTestCase(unittest.TestCase):
assert ['usr', 'lib', 'pardus'] == splitpath('usr/lib/pardus')
def testSubPath(self):
self.assert_(subpath('usr','usr'))
self.assert_(subpath('usr','usr/local/src'))
self.assert_(not subpath('usr/local','usr'))
self.assertTrue(subpath('usr','usr'))
self.assertTrue(subpath('usr','usr/local/src'))
self.assertTrue(not subpath('usr/local','usr'))
def testRemovePathPrefix(self):
pathname = removepathprefix('usr/local', 'usr/local/src')
+22 -22
View File
@@ -19,7 +19,7 @@ class VersionTestCase(unittest.TestCase):
def testSingle(self):
v1 = Version("103")
v2 = Version("90")
self.assert_(v1 > v2)
self.assertTrue(v1 > v2)
def testOpsNumerical(self):
v1 = Version("0.3.1")
@@ -27,11 +27,11 @@ class VersionTestCase(unittest.TestCase):
v3 = Version("1.5.2")
v4 = Version("0.3.1")
v5 = Version("2.07")
self.assert_(v1 < v2)
self.assert_(v3 > v2)
self.assert_(v1 <= v3)
self.assert_(v4 >= v4)
self.assert_(v5 > v3)
self.assertTrue(v1 < v2)
self.assertTrue(v3 > v2)
self.assertTrue(v1 <= v3)
self.assertTrue(v4 >= v4)
self.assertTrue(v5 > v3)
def testOpsKeywords(self):
# with keywords
@@ -43,33 +43,33 @@ class VersionTestCase(unittest.TestCase):
v6 = Version("2.23_m1")
v7 = Version("2.23_rc1")
v8 = Version("2.23_rc2")
self.assert_(v1 < v2)
self.assert_(v1 > v3)
self.assert_(v1 < v4)
self.assert_(v1 > v5)
self.assert_(v2 < v4)
self.assert_(v2 > v5)
self.assert_(v6 < v4)
self.assert_(v6 > v5)
self.assert_(v7 > v5)
self.assert_(v8 > v7)
self.assertTrue(v1 < v2)
self.assertTrue(v1 > v3)
self.assertTrue(v1 < v4)
self.assertTrue(v1 > v5)
self.assertTrue(v2 < v4)
self.assertTrue(v2 > v5)
self.assertTrue(v6 < v4)
self.assertTrue(v6 > v5)
self.assertTrue(v7 > v5)
self.assertTrue(v8 > v7)
v1 = Version("1.0_alpha1")
v2 = Version("1.0_alpha2")
self.assert_(v2 > v1)
self.assertTrue(v2 > v1)
def testOpsCharacters(self):
# with character
v1 = Version("2.10a")
v2 = Version("2.10")
v3 = Version("2.10d")
self.assert_(v1 > v2)
self.assert_(v1 < v3)
self.assert_(v2 < v3)
self.assertTrue(v1 > v2)
self.assertTrue(v1 < v3)
self.assertTrue(v2 < v3)
def testGeBug(self):
# bug 603
v1 = Version('1.8.0')
v2 = Version('1.9.1')
self.assert_( not v1 > v2 )
self.assert_( not v1 >= v2 )
self.assertTrue( not v1 > v2 )
self.assertTrue( not v1 >= v2 )