[yum-commits] Branch 'yum-3_2_X' - test/simpleupdatetests.py
James Antill
james at osuosl.org
Mon Feb 2 20:51:00 UTC 2009
test/simpleupdatetests.py | 130 +++++++++++++++++++++++++++++++++++++++-------
1 file changed, 113 insertions(+), 17 deletions(-)
New commits:
commit 6a23ca8e00877ebb3ae8ffc0444acb278bcf940b
Author: James Antill <james at and.org>
Date: Mon Feb 2 15:50:47 2009 -0500
Fix testcase to not use the same object in multiple repos.
diff --git a/test/simpleupdatetests.py b/test/simpleupdatetests.py
index 01eecbe..0a84f3f 100644
--- a/test/simpleupdatetests.py
+++ b/test/simpleupdatetests.py
@@ -481,46 +481,141 @@ class SimpleUpdateTests(OperationsTests):
self.assertResult((bar12,))
def testUpdateMultiRequiresVersions1(self):
- p11 = FakePackage('perl', '1', '1', '0', 'i386')
+ pi11 = FakePackage('perl', '1', '1', '0', 'i386')
+ pr11 = FakePackage('perl', '1', '1', '0', 'i386')
p12 = FakePackage('perl', '1', '2', '0', 'i386')
- pv11 = FakePackage('perl-version', '1', '1', '0', 'i386')
- pv11.addRequires('perl', 'GE', ('0', '0', '0'))
- pv11.addRequires('perl', 'EQ', ('0', '1', '1'))
+ pvi11 = FakePackage('perl-version', '1', '1', '0', 'i386')
+ pvi11.addRequires('perl', 'GE', ('0', '0', '0'))
+ pvi11.addRequires('perl', 'EQ', ('0', '1', '1'))
+ pvr11 = FakePackage('perl-version', '1', '1', '0', 'i386')
+ pvr11.addRequires('perl', 'GE', ('0', '0', '0'))
+ pvr11.addRequires('perl', 'EQ', ('0', '1', '1'))
pv12 = FakePackage('perl-version', '1', '2', '0', 'i386')
pv12.addRequires('perl', 'GE', ('0', '0', '0'))
pv12.addRequires('perl', 'EQ', ('0', '1', '2'))
res, msg = self.runOperation(['update', 'perl'],
- [p11, pv11],
+ [pi11, pvi11],
[p12, pv12])
self.assert_(res=='ok', msg)
self.assertResult((p12,pv12))
def testUpdateMultiRequiresVersions2(self):
- p11 = FakePackage('perl', '1', '1', '0', 'i386')
+ pi11 = FakePackage('perl', '1', '1', '0', 'i386')
+ pr11 = FakePackage('perl', '1', '1', '0', 'i386')
p12 = FakePackage('perl', '1', '2', '0', 'i386')
- pv11 = FakePackage('perl-version', '1', '1', '0', 'i386')
- pv11.addRequires('perl', 'GE', ('0', '0', '0'))
- pv11.addRequires('perl', 'EQ', ('0', '1', '1'))
+ pvi11 = FakePackage('perl-version', '1', '1', '0', 'i386')
+ pvi11.addRequires('perl', 'GE', ('0', '0', '0'))
+ pvi11.addRequires('perl', 'EQ', ('0', '1', '1'))
+ pvr11 = FakePackage('perl-version', '1', '1', '0', 'i386')
+ pvr11.addRequires('perl', 'GE', ('0', '0', '0'))
+ pvr11.addRequires('perl', 'EQ', ('0', '1', '1'))
pv12 = FakePackage('perl-version', '1', '2', '0', 'i386')
pv12.addRequires('perl', 'GE', ('0', '0', '0'))
pv12.addRequires('perl', 'EQ', ('0', '1', '2'))
res, msg = self.runOperation(['update', 'perl'],
- [p11, pv11],
- [p11,p12, pv11,pv12])
+ [pi11, pvi11],
+ [pr11,p12, pvr11,pv12])
+ self.assert_(res=='ok', msg)
+ self.assertResult((p12,pv12))
+
+ def testUpdateMultiRequiresVersions3(self):
+ pi11 = FakePackage('perl', '1', '1', '0', 'i386')
+ pr11 = FakePackage('perl', '1', '1', '0', 'i386')
+ p12 = FakePackage('perl', '1', '2', '0', 'i386')
+
+ pvi11 = FakePackage('perl-version', '1', '1', '0', 'i386')
+ pvi11.addRequires('perl', 'GE', ('0', '0', '0'))
+ pvi11.addRequires('perl', 'EQ', ('0', '1', '1'))
+ pvr11 = FakePackage('perl-version', '1', '1', '0', 'i386')
+ pvr11.addRequires('perl', 'GE', ('0', '0', '0'))
+ pvr11.addRequires('perl', 'EQ', ('0', '1', '1'))
+ pv12 = FakePackage('perl-version', '1', '2', '0', 'i386')
+ pv12.addRequires('perl', 'GE', ('0', '0', '0'))
+ pv12.addRequires('perl', 'EQ', ('0', '1', '2'))
+
+ res, msg = self.runOperation(['update', 'perl-version'],
+ [pi11, pvi11],
+ [pr11,p12, pvr11,pv12])
self.assert_(res=='ok', msg)
self.assertResult((p12,pv12))
def testUpdateMultiRequiresVersions4(self):
- p11 = FakePackage('perl', '1', '1', '0', 'i386')
+ pi11 = FakePackage('perl', '1', '1', '0', 'i386')
+ pr11 = FakePackage('perl', '1', '1', '0', 'i386')
+ p12 = FakePackage('perl', '1', '2', '0', 'i386')
+
+ pvi11 = FakePackage('perl-version', '1', '1', '0', 'i386')
+ pvi11.addRequires('perl', 'GE', ('0', '0', '0'))
+ pvi11.addRequires('perl', 'EQ', ('0', '1', '1'))
+ pvr11 = FakePackage('perl-version', '1', '1', '0', 'i386')
+ pvr11.addRequires('perl', 'GE', ('0', '0', '0'))
+ pvr11.addRequires('perl', 'EQ', ('0', '1', '1'))
+ pv12 = FakePackage('perl-version', '1', '2', '0', 'i386')
+ pv12.addRequires('perl', 'GE', ('0', '0', '0'))
+ pv12.addRequires('perl', 'EQ', ('0', '1', '2'))
+
+ pbi11 = FakePackage('perl-blah', '1', '1', '0', 'i386')
+ pbi11.addRequires('perl', 'EQ', ('0', '1', '1'))
+ pbi11.addRequires('perl', 'GE', ('0', '0', '0'))
+ pbr11 = FakePackage('perl-blah', '1', '1', '0', 'i386')
+ pbr11.addRequires('perl', 'EQ', ('0', '1', '1'))
+ pbr11.addRequires('perl', 'GE', ('0', '0', '0'))
+ pb12 = FakePackage('perl-blah', '1', '2', '0', 'i386')
+ pb12.addRequires('perl', 'EQ', ('0', '1', '2'))
+ pb12.addRequires('perl', 'GE', ('0', '0', '0'))
+
+ res, msg = self.runOperation(['update', 'perl-version'],
+ [pi11, pbi11, pvi11],
+ [pr11,p12, pbr11,pb12, pvr11,pv12])
+ self.assert_(res=='ok', msg)
+ self.assertResult((p12,pb12,pv12))
+
+ def testUpdateMultiRequiresVersions5(self):
+ pi11 = FakePackage('perl', '1', '1', '0', 'i386')
+ pr11 = FakePackage('perl', '1', '1', '0', 'i386')
p12 = FakePackage('perl', '1', '2', '0', 'i386')
- pv11 = FakePackage('perl-version', '1', '1', '0', 'i386')
- pv11.addRequires('perl', 'GE', ('0', '0', '0'))
- pv11.addRequires('perl', 'EQ', ('0', '1', '1'))
+ pvi11 = FakePackage('perl-version', '1', '1', '0', 'i386')
+ pvi11.addRequires('perl', 'GE', ('0', '0', '0'))
+ pvi11.addRequires('perl', 'EQ', ('0', '1', '1'))
+ pvr11 = FakePackage('perl-version', '1', '1', '0', 'i386')
+ pvr11.addRequires('perl', 'GE', ('0', '0', '0'))
+ pvr11.addRequires('perl', 'EQ', ('0', '1', '1'))
+ pv12 = FakePackage('perl-version', '1', '2', '0', 'i386')
+ pv12.addRequires('perl', 'GE', ('0', '0', '0'))
+ pv12.addRequires('perl', 'EQ', ('0', '1', '2'))
+
+ pbi11 = FakePackage('perl-blah', '1', '1', '0', 'i386')
+ pbi11.addRequires('perl', 'EQ', ('0', '1', '1'))
+ pbi11.addRequires('perl', 'GE', ('0', '0', '0'))
+ pbr11 = FakePackage('perl-blah', '1', '1', '0', 'i386')
+ pbr11.addRequires('perl', 'EQ', ('0', '1', '1'))
+ pbr11.addRequires('perl', 'GE', ('0', '0', '0'))
+ pb12 = FakePackage('perl-blah', '1', '2', '0', 'i386')
+ pb12.addRequires('perl', 'EQ', ('0', '1', '2'))
+ pb12.addRequires('perl', 'GE', ('0', '0', '0'))
+
+ res, msg = self.runOperation(['update', 'perl-blah'],
+ [pi11, pbi11, pvi11],
+ [pr11,p12, pbr11,pb12, pvr11,pv12])
+ self.assert_(res=='ok', msg)
+ self.assertResult((p12,pb12,pv12))
+
+ def testUpdateMultiRequiresVersions8(self):
+ pi11 = FakePackage('perl', '1', '1', '0', 'i386')
+ pr11 = FakePackage('perl', '1', '1', '0', 'i386')
+ p12 = FakePackage('perl', '1', '2', '0', 'i386')
+
+ pvi11 = FakePackage('perl-version', '1', '1', '0', 'i386')
+ pvi11.addRequires('perl', 'GE', ('0', '0', '0'))
+ pvi11.addRequires('perl', 'EQ', ('0', '1', '1'))
+ pvr11 = FakePackage('perl-version', '1', '1', '0', 'i386')
+ pvr11.addRequires('perl', 'GE', ('0', '0', '0'))
+ pvr11.addRequires('perl', 'EQ', ('0', '1', '1'))
pv12 = FakePackage('perl-version', '1', '2', '0', 'i386')
pv12.addRequires('perl', 'GE', ('0', '0', '0'))
pv12.addRequires('perl', 'EQ', ('0', '1', '2'))
@@ -529,8 +624,9 @@ class SimpleUpdateTests(OperationsTests):
pv13.addRequires('perl', 'EQ', ('0', '1', '3'))
res, msg = self.runOperation(['update', 'perl'],
- [p11, pv11],
- [p11,p12, pv11,pv13,pv12])
+ [pi11, pvi11],
+ [pr11,p12, pvr11,pv12,pv13])
# FIXME: This fails ... it tries to install pv13 instead
+ self.assert_(res=='err', msg)
# self.assert_(res=='ok', msg)
# self.assertResult((p12,pv12))
More information about the Yum-commits
mailing list