From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 19FF113825B for ; Sun, 15 May 2016 23:51:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1BBDF142FB; Sun, 15 May 2016 23:51:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 027DD14304 for ; Sun, 15 May 2016 23:51:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 695E8340C23 for ; Sun, 15 May 2016 23:51:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 08A96987 for ; Sun, 15 May 2016 23:51:14 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1463336888.189df1313426c17db8ec6ed02e8286e26ed64fe5.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/tests/ X-VCS-Repository: proj/portage X-VCS-Files: repoman/pym/repoman/tests/__init__.py repoman/pym/repoman/tests/runTests.py X-VCS-Directories: repoman/pym/repoman/tests/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 189df1313426c17db8ec6ed02e8286e26ed64fe5 X-VCS-Branch: master Date: Sun, 15 May 2016 23:51:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e74645e7-897a-4a2e-8fdb-57bcbe7c7db1 X-Archives-Hash: 2c32164eff2f32bece62321c501e9112 commit: 189df1313426c17db8ec6ed02e8286e26ed64fe5 Author: Brian Dolbec gentoo org> AuthorDate: Sun May 15 04:15:38 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Sun May 15 18:28:08 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=189df131 repoman/tests/__init__.py: Import the repoman portage instance repoman/pym/repoman/tests/__init__.py | 3 ++- repoman/pym/repoman/tests/runTests.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/repoman/pym/repoman/tests/__init__.py b/repoman/pym/repoman/tests/__init__.py index 7243e7a..af234d4 100644 --- a/repoman/pym/repoman/tests/__init__.py +++ b/repoman/pym/repoman/tests/__init__.py @@ -22,7 +22,8 @@ try: except ImportError: unittest_skip_shims = True -import portage +from repoman._portage import portage + from portage import os from portage import _encodings from portage import _unicode_decode diff --git a/repoman/pym/repoman/tests/runTests.py b/repoman/pym/repoman/tests/runTests.py index 882911c..83e3d35 100644 --- a/repoman/pym/repoman/tests/runTests.py +++ b/repoman/pym/repoman/tests/runTests.py @@ -36,7 +36,8 @@ sys.path.insert(0, repoman_pym) portage_pym = osp.dirname(osp.dirname(repoman_pym))+'/pym' sys.path.insert(0, portage_pym) -import portage +# import our centrally initialized portage instance +from repoman._portage import portage portage._internal_caller = True # Ensure that we don't instantiate portage.settings, so that tests should From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BB82C13825B for ; Sun, 15 May 2016 18:34:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BD6BD14242; Sun, 15 May 2016 18:34:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1189F1425D for ; Sun, 15 May 2016 18:34:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0AE0B340BFD for ; Sun, 15 May 2016 18:34:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6684896D for ; Sun, 15 May 2016 18:34:31 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1463336888.189df1313426c17db8ec6ed02e8286e26ed64fe5.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/tests/ X-VCS-Repository: proj/portage X-VCS-Files: repoman/pym/repoman/tests/__init__.py repoman/pym/repoman/tests/runTests.py X-VCS-Directories: repoman/pym/repoman/tests/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 189df1313426c17db8ec6ed02e8286e26ed64fe5 X-VCS-Branch: repoman Date: Sun, 15 May 2016 18:34:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 43631cfc-4ba9-4dd1-a453-88300af4cc11 X-Archives-Hash: fd157e0a9b4220b39886ef6fdf381dd0 Message-ID: <20160515183431.Jcf8UvcROA22Av7ie97QUEzgnVw4pi5ishL8C3qslk4@z> commit: 189df1313426c17db8ec6ed02e8286e26ed64fe5 Author: Brian Dolbec gentoo org> AuthorDate: Sun May 15 04:15:38 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Sun May 15 18:28:08 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=189df131 repoman/tests/__init__.py: Import the repoman portage instance repoman/pym/repoman/tests/__init__.py | 3 ++- repoman/pym/repoman/tests/runTests.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/repoman/pym/repoman/tests/__init__.py b/repoman/pym/repoman/tests/__init__.py index 7243e7a..af234d4 100644 --- a/repoman/pym/repoman/tests/__init__.py +++ b/repoman/pym/repoman/tests/__init__.py @@ -22,7 +22,8 @@ try: except ImportError: unittest_skip_shims = True -import portage +from repoman._portage import portage + from portage import os from portage import _encodings from portage import _unicode_decode diff --git a/repoman/pym/repoman/tests/runTests.py b/repoman/pym/repoman/tests/runTests.py index 882911c..83e3d35 100644 --- a/repoman/pym/repoman/tests/runTests.py +++ b/repoman/pym/repoman/tests/runTests.py @@ -36,7 +36,8 @@ sys.path.insert(0, repoman_pym) portage_pym = osp.dirname(osp.dirname(repoman_pym))+'/pym' sys.path.insert(0, portage_pym) -import portage +# import our centrally initialized portage instance +from repoman._portage import portage portage._internal_caller = True # Ensure that we don't instantiate portage.settings, so that tests should