Re: [gentoo-portage-dev] [PATCH 4/6] tests: Fix running on installed copy of Portage

[Michał Górny]

Dnia 2014-08-22, o godz. 15:19:12
Brian Dolbec <dolsen@g.o> napisał(a):

> On Thu, 21 Aug 2014 22:19:42 +0200
> Michał Górny <mgorny@g.o> wrote:
>
> > ---
> >  pym/portage/tests/__init__.py                    | 20
> > ++++++++++++++++++ pym/portage/tests/dbapi/test_portdb_cache.py
> > |  5 ++--- pym/portage/tests/emerge/test_emerge_slot_abi.py |  7
> > +++---- pym/portage/tests/emerge/test_simple.py          | 26
> > ++++++++++++------------
> > pym/portage/tests/lint/test_compile_modules.py   | 10 +++++----
> > pym/portage/tests/lint/test_import_modules.py    |  8 ++++++--
> > pym/portage/tests/repoman/test_simple.py         |  8 +++++---
> > pym/portage/tests/resolver/ResolverPlayground.py |  8 +++++---
> > pym/portage/tests/util/test_getconfig.py         |  5 ++--- 9 files
> > changed, 62 insertions(+), 35 deletions(-)
> >
>
> diff --git a/pym/portage/tests/util/test_getconfig.py
> > b/pym/portage/tests/util/test_getconfig.py index e5fd60f..16f415c
> > 100644 --- a/pym/portage/tests/util/test_getconfig.py
> > +++ b/pym/portage/tests/util/test_getconfig.py
> > @@ -3,6 +3,7 @@
> >
> >  import tempfile
> >
> > +import portage
> >  from portage import os
> >  from portage import shutil
> >  from portage import _unicode_encode
> > @@ -26,9 +27,7 @@ class GetConfigTestCase(TestCase):
> >  	}
> >
> >  	def testGetConfig(self):
> > -
> > -		make_globals_file = os.path.join(PORTAGE_BASE_PATH,
> > -			'cnf', 'make.globals')
> > +		make_globals_file = os.path.join(self.cnf_path,
> > "make.globals") d = getconfig(make_globals_file)
> >  		for k, v in self._cases.items():
> >  			self.assertEqual(d[k], v)
>
> Why was "import portage" added but not used anywhere in additional code?

Good catch. It was used in the previous version of the patch. Fixed now.


-- 
Best regards,
Michał Górny