Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/tests/resolver/
Date: Thu, 12 Sep 2019 19:43:36
Message-Id: 1568317357.524aa791f28ffcc1df921d8a8a9c111b7e359099.zmedico@gentoo
1 commit: 524aa791f28ffcc1df921d8a8a9c111b7e359099
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 12 19:40:44 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 12 19:42:37 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=524aa791
7
8 VirtualCircularChoicesTestCase: remove todo flag (bug 384107)
9
10 This test passes since the fix for bug 639346 in commit
11 09185309aad49b83f29ef94b11318998e520e138.
12
13 Bug: https://bugs.gentoo.org/384107
14 Bug: https://bugs.gentoo.org/639346
15 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
16
17 lib/portage/tests/resolver/test_circular_choices.py | 5 +----
18 1 file changed, 1 insertion(+), 4 deletions(-)
19
20 diff --git a/lib/portage/tests/resolver/test_circular_choices.py b/lib/portage/tests/resolver/test_circular_choices.py
21 index 33b730627..418173689 100644
22 --- a/lib/portage/tests/resolver/test_circular_choices.py
23 +++ b/lib/portage/tests/resolver/test_circular_choices.py
24 @@ -1,4 +1,4 @@
25 -# Copyright 2011 Gentoo Foundation
26 +# Copyright 2011-2019 Gentoo Authors
27 # Distributed under the terms of the GNU General Public License v2
28
29 from portage.tests import TestCase
30 @@ -34,9 +34,6 @@ class CircularChoicesTestCase(TestCase):
31 class VirtualCircularChoicesTestCase(TestCase):
32 def testDirectVirtualCircularDependency(self):
33
34 - # Bug #384107
35 - self.todo = True
36 -
37 ebuilds = {
38 "dev-java/icedtea-6.1.10.3": { "SLOT" : "6", "DEPEND": "virtual/jdk" },
39 "dev-java/icedtea6-bin-1.10.3": {},