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:05:52
Message-Id: 1568314984.54cab2dea3c55cbcd3a9bc2831c0ad25b12f12fa.zmedico@gentoo
1 commit: 54cab2dea3c55cbcd3a9bc2831c0ad25b12f12fa
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 12 18:59:09 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 12 19:03:04 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=54cab2de
7
8 SlotConflictMaskUpdateTestCase: remove todo flag (bug 693242)
9
10 This test passes since the fix premature backtracking termination in
11 commit bb0bb4104b0d6cab16abce9cd6e1683c0b6d5c8d.
12
13 Bug: https://bugs.gentoo.org/693242
14 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
15
16 lib/portage/tests/resolver/test_slot_conflict_mask_update.py | 5 +----
17 1 file changed, 1 insertion(+), 4 deletions(-)
18
19 diff --git a/lib/portage/tests/resolver/test_slot_conflict_mask_update.py b/lib/portage/tests/resolver/test_slot_conflict_mask_update.py
20 index a90eeac29..37e969828 100644
21 --- a/lib/portage/tests/resolver/test_slot_conflict_mask_update.py
22 +++ b/lib/portage/tests/resolver/test_slot_conflict_mask_update.py
23 @@ -1,4 +1,4 @@
24 -# Copyright 2013 Gentoo Foundation
25 +# Copyright 2013-2019 Gentoo Authors
26 # Distributed under the terms of the GNU General Public License v2
27
28 from portage.tests import TestCase
29 @@ -13,9 +13,6 @@ class SlotConflictMaskUpdateTestCase(TestCase):
30 in first. This is not always a good idea. Mask the highest version instead.
31 """
32
33 -
34 - self.todo = True
35 -
36 ebuilds = {
37 "dev-libs/A-1": { "DEPEND": "=dev-libs/C-1 dev-libs/B" },
38 "dev-libs/B-1": { "DEPEND": "=dev-libs/C-1" },