From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QOJJF-0002ZT-Gk for garchives@archives.gentoo.org; Mon, 23 May 2011 00:47:49 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E63721C04C; Mon, 23 May 2011 00:46:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B44521C081 for ; Mon, 23 May 2011 00:46:56 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 343C81B401B for ; Mon, 23 May 2011 00:46:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 41E5A80506 for ; Mon, 23 May 2011 00:46:55 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <436a3cea2e56d57fdae788a4fdaf49438a10b4e5.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/resolver/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/tests/resolver/test_depth.py X-VCS-Directories: pym/portage/tests/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 436a3cea2e56d57fdae788a4fdaf49438a10b4e5 Date: Mon, 23 May 2011 00:46:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 843f4cbf5b7d80242531149d36ac66e0 commit: 436a3cea2e56d57fdae788a4fdaf49438a10b4e5 Author: Zac Medico gentoo org> AuthorDate: Mon May 23 00:44:49 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon May 23 00:44:49 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D436a3cea test_depth: use merge_order_assertions --- pym/portage/tests/resolver/test_depth.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/pym/portage/tests/resolver/test_depth.py b/pym/portage/tests= /resolver/test_depth.py index 8772acb..cb1e2dd 100644 --- a/pym/portage/tests/resolver/test_depth.py +++ b/pym/portage/tests/resolver/test_depth.py @@ -145,7 +145,9 @@ class ResolverDepthTestCase(TestCase): options =3D {"--update" : True, "--deep" : 1}, success =3D True, ambiguous_merge_order =3D True, - mergelist =3D [('dev-java/icedtea-6.1-r1', 'dev-java/gcj-jdk-4.5-r1'= ), ('virtual/jdk-1.6.0-r1', 'virtual/jdk-1.5.0-r1', 'virtual/jre-1.6.0-r1= ', 'virtual/jre-1.5.0-r1')]), + merge_order_assertions=3D(('dev-java/icedtea-6.1-r1', 'virtual/jdk-1= .6.0-r1'), ('virtual/jdk-1.6.0-r1', 'virtual/jre-1.6.0-r1'), + ('dev-java/gcj-jdk-4.5-r1', 'virtual/jdk-1.5.0-r1'), ('virtual/jdk-= 1.5.0-r1', 'virtual/jre-1.5.0-r1')), + mergelist =3D [('dev-java/icedtea-6.1-r1', 'dev-java/gcj-jdk-4.5-r1'= , 'virtual/jdk-1.6.0-r1', 'virtual/jdk-1.5.0-r1', 'virtual/jre-1.6.0-r1',= 'virtual/jre-1.5.0-r1')]), =20 ResolverPlaygroundTestCase( ["virtual/jre:1.5"],