[gentoo-portage-dev] [PATCH] portage.tests.dbapi.test_portdb_cache: Delete deprecated code.

[gentoo-portage-dev] [PATCH] portage.tests.dbapi.test_portdb_cache: Delete deprecated code.

[Arfrever Frehtes Taifersar Arahesis]

[-- Attachment #1.1: Type: Text/Plain, Size: 224 bytes --]

[[[
portage.tests.dbapi.test_portdb_cache: Delete deprecated code.

9 calls to deprecated portage.repository.config.RepoConfigLoader.mainRepoLocation()
function have been deleted.
]]]

--
Arfrever Frehtes Taifersar Arahesis

[-- Attachment #1.2: portage.patch --]
[-- Type: text/x-patch, Size: 3635 bytes --]

--- pym/portage/tests/dbapi/test_portdb_cache.py
+++ pym/portage/tests/dbapi/test_portdb_cache.py
@@ -47,7 +47,7 @@
 			(lambda: not os.path.exists(md5_cache_dir),),
 			python_cmd + (textwrap.dedent("""
 				import os, sys, portage
-				if portage.portdb.repositories.mainRepoLocation() in portage.portdb._pregen_auxdb:
+				if portage.portdb.repositories['test_repo'].location in portage.portdb._pregen_auxdb:
 					sys.exit(1)
 			"""),),
 
@@ -56,13 +56,13 @@
 			(lambda: os.path.exists(md5_cache_dir),),
 			python_cmd + (textwrap.dedent("""
 				import os, sys, portage
-				if portage.portdb.repositories.mainRepoLocation() not in portage.portdb._pregen_auxdb:
+				if portage.portdb.repositories['test_repo'].location not in portage.portdb._pregen_auxdb:
 					sys.exit(1)
 			"""),),
 			python_cmd + (textwrap.dedent("""
 				import os, sys, portage
 				from portage.cache.flat_hash import md5_database
-				if not isinstance(portage.portdb._pregen_auxdb[portage.portdb.repositories.mainRepoLocation()], md5_database):
+				if not isinstance(portage.portdb._pregen_auxdb[portage.portdb.repositories['test_repo'].location], md5_database):
 					sys.exit(1)
 			"""),),
 
@@ -73,13 +73,13 @@
 			(lambda: os.path.exists(md5_cache_dir),),
 			python_cmd + (textwrap.dedent("""
 				import os, sys, portage
-				if portage.portdb.repositories.mainRepoLocation() not in portage.portdb._pregen_auxdb:
+				if portage.portdb.repositories['test_repo'].location not in portage.portdb._pregen_auxdb:
 					sys.exit(1)
 			"""),),
 			python_cmd + (textwrap.dedent("""
 				import os, sys, portage
 				from portage.cache.flat_hash import md5_database
-				if not isinstance(portage.portdb._pregen_auxdb[portage.portdb.repositories.mainRepoLocation()], md5_database):
+				if not isinstance(portage.portdb._pregen_auxdb[portage.portdb.repositories['test_repo'].location], md5_database):
 					sys.exit(1)
 			"""),),
 
@@ -90,13 +90,13 @@
 				("cache-formats = pms md5-dict", layout_conf_path,)))),
 			(portage_python, "-b", "-Wd", "-Wi::DeprecationWarning", "-c") + (textwrap.dedent("""
 				import os, sys, portage
-				if portage.portdb.repositories.mainRepoLocation() not in portage.portdb._pregen_auxdb:
+				if portage.portdb.repositories['test_repo'].location not in portage.portdb._pregen_auxdb:
 					sys.exit(1)
 			"""),),
 			(portage_python, "-b", "-Wd", "-Wi::DeprecationWarning", "-c") + (textwrap.dedent("""
 				import os, sys, portage
 				from portage.cache.metadata import database as pms_database
-				if not isinstance(portage.portdb._pregen_auxdb[portage.portdb.repositories.mainRepoLocation()], pms_database):
+				if not isinstance(portage.portdb._pregen_auxdb[portage.portdb.repositories['test_repo'].location], pms_database):
 					sys.exit(1)
 			"""),),
 
@@ -105,13 +105,13 @@
 			(BASH_BINARY, "-c", "rm %s" % portage._shell_quote(layout_conf_path)),
 			python_cmd + (textwrap.dedent("""
 				import os, sys, portage
-				if portage.portdb.repositories.mainRepoLocation() not in portage.portdb._pregen_auxdb:
+				if portage.portdb.repositories['test_repo'].location not in portage.portdb._pregen_auxdb:
 					sys.exit(1)
 			"""),),
 			python_cmd + (textwrap.dedent("""
 				import os, sys, portage
 				from portage.cache.flat_hash import md5_database
-				if not isinstance(portage.portdb._pregen_auxdb[portage.portdb.repositories.mainRepoLocation()], md5_database):
+				if not isinstance(portage.portdb._pregen_auxdb[portage.portdb.repositories['test_repo'].location], md5_database):
 					sys.exit(1)
 			"""),),
 		)

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [gentoo-portage-dev] [PATCH] portage.tests.dbapi.test_portdb_cache: Delete deprecated code.

[Zac Medico]

On 12/13/2014 08:52 AM, Arfrever Frehtes Taifersar Arahesis wrote:
> [[[
> portage.tests.dbapi.test_portdb_cache: Delete deprecated code.
> 
> 9 calls to deprecated portage.repository.config.RepoConfigLoader.mainRepoLocation()
> function have been deleted.
> ]]]
> 
> --
> Arfrever Frehtes Taifersar Arahesis
> 

LGTM.
-- 
Thanks,
Zac

Re: [gentoo-portage-dev] [PATCH] portage.tests.dbapi.test_portdb_cache: Delete deprecated code.

[Brian Dolbec]

On Sat, 13 Dec 2014 10:14:15 -0800
Zac Medico <zmedico@gentoo.org> wrote:

> On 12/13/2014 08:52 AM, Arfrever Frehtes Taifersar Arahesis wrote:
> > [[[
> > portage.tests.dbapi.test_portdb_cache: Delete deprecated code.
> > 
> > 9 calls to deprecated
> > portage.repository.config.RepoConfigLoader.mainRepoLocation()
> > function have been deleted. ]]]
> > 
> > --
> > Arfrever Frehtes Taifersar Arahesis
> > 
> 
> LGTM.

yup, merge

-- 
Brian Dolbec <dolsen>