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 8CF9D13825A for ; Sun, 15 May 2016 04:16:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1F2021C067; Sun, 15 May 2016 04:16:49 +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 7420921C067 for ; Sun, 15 May 2016 04:16:49 +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 23803340C35 for ; Sun, 15 May 2016 04:16:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 25FBA33A for ; Sun, 15 May 2016 04:16:46 +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: <1463285738.53acfdad1ebcc9ceb042d5737b1cdd9ffe1ee02c.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: 53acfdad1ebcc9ceb042d5737b1cdd9ffe1ee02c X-VCS-Branch: repoman Date: Sun, 15 May 2016 04:16:46 +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: 26f92186-76eb-4dec-a185-e73cf2ddee81 X-Archives-Hash: 0e01329d7cd9da7be984b0263e98a95f commit: 53acfdad1ebcc9ceb042d5737b1cdd9ffe1ee02c Author: Brian Dolbec gentoo org> AuthorDate: Sun May 15 04:15:38 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Sun May 15 04:15:38 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=53acfdad 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