[gentoo-commits] proj/portage:repoman commit in: repoman/pym/repoman/tests/

[Brian Dolbec]

commit:     189df1313426c17db8ec6ed02e8286e26ed64fe5
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 04:15:38 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> 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