diff options
author | Otavio Pontes <otaviobp@gmail.com> | 2010-08-03 14:35:07 +0000 |
---|---|---|
committer | Otavio Pontes <otaviobp@gmail.com> | 2010-08-03 14:35:07 +0000 |
commit | 7c91baa45d49bdeb5462fef35739961d0d008971 (patch) | |
tree | 1549798c9e6995a3956345270749df32111ced9d | |
parent | Uncommenting tests that use to fail (diff) | |
download | portage-multirepo-7c91baa45d49bdeb5462fef35739961d0d008971.tar.gz portage-multirepo-7c91baa45d49bdeb5462fef35739961d0d008971.tar.bz2 portage-multirepo-7c91baa45d49bdeb5462fef35739961d0d008971.zip |
Adding repo_name tests to testAtom
-rw-r--r-- | pym/portage/tests/dep/testAtom.py | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/pym/portage/tests/dep/testAtom.py b/pym/portage/tests/dep/testAtom.py index a4972905..9345711f 100644 --- a/pym/portage/tests/dep/testAtom.py +++ b/pym/portage/tests/dep/testAtom.py @@ -15,23 +15,30 @@ class TestAtom(TestCase): tests = [ ( "=sys-apps/portage-2.1-r1:0[doc,a=,!b=,c?,!d?,-e]", - ('=', 'sys-apps/portage', '2.1-r1', '0', '[doc,a=,!b=,c?,!d?,-e]'), False ), + ('=', 'sys-apps/portage', '2.1-r1', '0', '[doc,a=,!b=,c?,!d?,-e]', None), False ), ( "=sys-apps/portage-2.1-r1*:0[doc]", - ('=*', 'sys-apps/portage', '2.1-r1', '0', '[doc]'), False ), + ('=*', 'sys-apps/portage', '2.1-r1', '0', '[doc]', None), False ), ( "sys-apps/portage:0[doc]", - (None, 'sys-apps/portage', None, '0', '[doc]'), False ), + (None, 'sys-apps/portage', None, '0', '[doc]', None), False ), ( "sys-apps/portage:0[doc]", - (None, 'sys-apps/portage', None, '0', '[doc]'), False ), + (None, 'sys-apps/portage', None, '0', '[doc]', None), False ), ( "*/*", - (None, '*/*', None, None, None), True ), + (None, '*/*', None, None, None, None), True ), ( "sys-apps/*", - (None, 'sys-apps/*', None, None, None), True ), + (None, 'sys-apps/*', None, None, None, None), True ), ( "*/portage", - (None, '*/portage', None, None, None), True ), + (None, '*/portage', None, None, None, None), True ), ( "s*s-*/portage:1", - (None, 's*s-*/portage', None, '1', None), True ), + (None, 's*s-*/portage', None, '1', None, None), True ), ( "*/po*ge:2", - (None, '*/po*ge', None, '2', None), True ), + (None, '*/po*ge', None, '2', None, None), True ), + + ( "=sys-apps/portage-2.1-r1:0::repo_name[doc,a=,!b=,c?,!d?,-e]", + ('=', 'sys-apps/portage', '2.1-r1', '0', '[doc,a=,!b=,c?,!d?,-e]', 'repo_name'), False ), + ( "=sys-apps/portage-2.1-r1*:0::repo_name[doc]", + ('=*', 'sys-apps/portage', '2.1-r1', '0', '[doc]', 'repo_name'), False ), + ( "sys-apps/portage:0::repo_name[doc]", + (None, 'sys-apps/portage', None, '0', '[doc]', 'repo_name'), False ), ] tests_xfail = [ @@ -65,7 +72,7 @@ class TestAtom(TestCase): for atom, parts, allow_wildcard in tests: a = Atom(atom, allow_wildcard=allow_wildcard) - op, cp, ver, slot, use = parts + op, cp, ver, slot, use, repo = parts self.assertEqual( op, a.operator, msg="Atom('%s').operator == '%s'" % ( atom, a.operator ) ) self.assertEqual( cp, a.cp, @@ -78,6 +85,8 @@ class TestAtom(TestCase): msg="Atom('%s').cpv == '%s'" % ( atom, a.cpv ) ) self.assertEqual( slot, a.slot, msg="Atom('%s').slot == '%s'" % ( atom, a.slot ) ) + self.assertEqual( repo, a.repo, + msg="Atom('%s').repo == '%s'" % ( atom, a.repo ) ) if a.use: expected_use = str(a.use) else: |