diff options
author | Tim Harder <radhermit@gmail.com> | 2021-03-04 13:41:41 -0700 |
---|---|---|
committer | Tim Harder <radhermit@gmail.com> | 2021-03-04 13:44:52 -0700 |
commit | 00684d51abf632310b58e5ed56b0ed61d9eeeb3d (patch) | |
tree | 19e965b2eb1ba5bc87ee5227dbb571a243a0ac56 | |
parent | coverage: minor config update (diff) | |
download | pkgcore-00684d51abf632310b58e5ed56b0ed61d9eeeb3d.tar.gz pkgcore-00684d51abf632310b58e5ed56b0ed61d9eeeb3d.tar.bz2 pkgcore-00684d51abf632310b58e5ed56b0ed61d9eeeb3d.zip |
tests: move to repo root dir
-rw-r--r-- | tests/__init__.py (renamed from tests/module/__init__.py) | 0 | ||||
-rw-r--r-- | tests/cache/__init__.py (renamed from tests/module/cache/__init__.py) | 0 | ||||
-rw-r--r-- | tests/cache/test_base.py (renamed from tests/module/cache/test_base.py) | 0 | ||||
-rw-r--r-- | tests/cache/test_flat_hash.py (renamed from tests/module/cache/test_flat_hash.py) | 0 | ||||
-rw-r--r-- | tests/cache/test_util.py (renamed from tests/module/cache/test_util.py) | 0 | ||||
-rw-r--r-- | tests/config/__init__.py (renamed from tests/module/config/__init__.py) | 0 | ||||
-rw-r--r-- | tests/config/test_basics.py (renamed from tests/module/config/test_basics.py) | 4 | ||||
-rw-r--r-- | tests/config/test_central.py (renamed from tests/module/config/test_central.py) | 36 | ||||
-rw-r--r-- | tests/config/test_cparser.py (renamed from tests/module/config/test_cparser.py) | 0 | ||||
-rw-r--r-- | tests/config/test_init.py (renamed from tests/module/config/test_init.py) | 2 | ||||
-rw-r--r-- | tests/ebuild/__init__.py (renamed from tests/module/ebuild/__init__.py) | 0 | ||||
-rw-r--r-- | tests/ebuild/test_atom.py (renamed from tests/module/ebuild/test_atom.py) | 0 | ||||
-rw-r--r-- | tests/ebuild/test_conditionals.py (renamed from tests/module/ebuild/test_conditionals.py) | 0 | ||||
-rw-r--r-- | tests/ebuild/test_cpv.py (renamed from tests/module/ebuild/test_cpv.py) | 0 | ||||
-rw-r--r-- | tests/ebuild/test_digest.py (renamed from tests/module/ebuild/test_digest.py) | 0 | ||||
-rw-r--r-- | tests/ebuild/test_eapi.py (renamed from tests/module/ebuild/test_eapi.py) | 0 | ||||
-rw-r--r-- | tests/ebuild/test_ebuild_src.py (renamed from tests/module/ebuild/test_ebuild_src.py) | 0 | ||||
-rw-r--r-- | tests/ebuild/test_eclass_cache.py (renamed from tests/module/ebuild/test_eclass_cache.py) | 0 | ||||
-rw-r--r-- | tests/ebuild/test_filter_env.py (renamed from tests/module/ebuild/test_filter_env.py) | 0 | ||||
-rw-r--r-- | tests/ebuild/test_formatter.py (renamed from tests/module/ebuild/test_formatter.py) | 0 | ||||
-rw-r--r-- | tests/ebuild/test_misc.py (renamed from tests/module/ebuild/test_misc.py) | 0 | ||||
-rw-r--r-- | tests/ebuild/test_portage_conf.py (renamed from tests/module/ebuild/test_portage_conf.py) | 0 | ||||
-rw-r--r-- | tests/ebuild/test_profiles.py (renamed from tests/module/ebuild/test_profiles.py) | 0 | ||||
-rw-r--r-- | tests/ebuild/test_repo_objs.py (renamed from tests/module/ebuild/test_repo_objs.py) | 0 | ||||
-rw-r--r-- | tests/ebuild/test_repository.py (renamed from tests/module/ebuild/test_repository.py) | 0 | ||||
-rw-r--r-- | tests/fetch/__init__.py (renamed from tests/module/fetch/__init__.py) | 0 | ||||
-rw-r--r-- | tests/fetch/test_base.py (renamed from tests/module/fetch/test_base.py) | 0 | ||||
-rw-r--r-- | tests/fetch/test_init.py (renamed from tests/module/fetch/test_init.py) | 0 | ||||
-rw-r--r-- | tests/fs/__init__.py (renamed from tests/module/fs/__init__.py) | 0 | ||||
-rw-r--r-- | tests/fs/fs_util.py (renamed from tests/module/fs/fs_util.py) | 0 | ||||
-rw-r--r-- | tests/fs/test_contents.py (renamed from tests/module/fs/test_contents.py) | 0 | ||||
-rw-r--r-- | tests/fs/test_fs.py (renamed from tests/module/fs/test_fs.py) | 0 | ||||
-rw-r--r-- | tests/fs/test_livefs.py (renamed from tests/module/fs/test_livefs.py) | 0 | ||||
-rw-r--r-- | tests/fs/test_ops.py (renamed from tests/module/fs/test_ops.py) | 0 | ||||
-rw-r--r-- | tests/merge/__init__.py (renamed from tests/module/merge/__init__.py) | 0 | ||||
-rw-r--r-- | tests/merge/test_engine.py (renamed from tests/module/merge/test_engine.py) | 0 | ||||
-rw-r--r-- | tests/merge/test_triggers.py (renamed from tests/module/merge/test_triggers.py) | 0 | ||||
-rw-r--r-- | tests/merge/util.py (renamed from tests/module/merge/util.py) | 0 | ||||
-rw-r--r-- | tests/package/__init__.py (renamed from tests/module/package/__init__.py) | 0 | ||||
-rw-r--r-- | tests/package/test_base.py (renamed from tests/module/package/test_base.py) | 0 | ||||
-rw-r--r-- | tests/package/test_metadata.py (renamed from tests/module/package/test_metadata.py) | 0 | ||||
-rw-r--r-- | tests/package/test_mutated.py (renamed from tests/module/package/test_mutated.py) | 0 | ||||
-rw-r--r-- | tests/pkgsets/__init__.py (renamed from tests/module/pkgsets/__init__.py) | 0 | ||||
-rw-r--r-- | tests/pkgsets/test_filelist.py (renamed from tests/module/pkgsets/test_filelist.py) | 0 | ||||
-rw-r--r-- | tests/pkgsets/test_glsa.py (renamed from tests/module/pkgsets/test_glsa.py) | 0 | ||||
-rw-r--r-- | tests/pkgsets/test_installed.py (renamed from tests/module/pkgsets/test_installed.py) | 0 | ||||
-rw-r--r-- | tests/repository/__init__.py (renamed from tests/module/repository/__init__.py) | 0 | ||||
-rw-r--r-- | tests/repository/test_filtered.py (renamed from tests/module/repository/test_filtered.py) | 0 | ||||
-rw-r--r-- | tests/repository/test_multiplex.py (renamed from tests/module/repository/test_multiplex.py) | 0 | ||||
-rw-r--r-- | tests/repository/test_prototype.py (renamed from tests/module/repository/test_prototype.py) | 0 | ||||
-rw-r--r-- | tests/resolver/__init__.py (renamed from tests/module/resolver/__init__.py) | 0 | ||||
-rw-r--r-- | tests/resolver/test_choice_point.py (renamed from tests/module/resolver/test_choice_point.py) | 0 | ||||
-rw-r--r-- | tests/resolver/test_pigeonholes.py (renamed from tests/module/resolver/test_pigeonholes.py) | 0 | ||||
-rw-r--r-- | tests/resolver/test_plan.py (renamed from tests/module/resolver/test_plan.py) | 0 | ||||
-rw-r--r-- | tests/restrictions/__init__.py (renamed from tests/module/restrictions/__init__.py) | 0 | ||||
-rw-r--r-- | tests/restrictions/test_boolean.py (renamed from tests/module/restrictions/test_boolean.py) | 0 | ||||
-rw-r--r-- | tests/restrictions/test_delegated.py (renamed from tests/module/restrictions/test_delegated.py) | 0 | ||||
-rw-r--r-- | tests/restrictions/test_packages.py (renamed from tests/module/restrictions/test_packages.py) | 0 | ||||
-rw-r--r-- | tests/restrictions/test_restriction.py (renamed from tests/module/restrictions/test_restriction.py) | 0 | ||||
-rw-r--r-- | tests/restrictions/test_util.py (renamed from tests/module/restrictions/test_util.py) | 0 | ||||
-rw-r--r-- | tests/restrictions/test_values.py (renamed from tests/module/restrictions/test_values.py) | 0 | ||||
-rw-r--r-- | tests/scripts/__init__.py (renamed from tests/module/scripts/__init__.py) | 0 | ||||
-rw-r--r-- | tests/scripts/test_pclean.py (renamed from tests/module/scripts/test_pclean.py) | 0 | ||||
-rw-r--r-- | tests/scripts/test_pclonecache.py (renamed from tests/module/scripts/test_pclonecache.py) | 0 | ||||
-rw-r--r-- | tests/scripts/test_pconfig.py (renamed from tests/module/scripts/test_pconfig.py) | 54 | ||||
-rw-r--r-- | tests/scripts/test_pebuild.py (renamed from tests/module/scripts/test_pebuild.py) | 0 | ||||
-rw-r--r-- | tests/scripts/test_pmaint.py (renamed from tests/module/scripts/test_pmaint.py) | 0 | ||||
-rw-r--r-- | tests/scripts/test_pmerge.py (renamed from tests/module/scripts/test_pmerge.py) | 0 | ||||
-rw-r--r-- | tests/scripts/test_pplugincache.py (renamed from tests/module/scripts/test_pplugincache.py) | 0 | ||||
-rw-r--r-- | tests/scripts/test_pquery.py (renamed from tests/module/scripts/test_pquery.py) | 0 | ||||
-rw-r--r-- | tests/scripts/test_pshowkw.py (renamed from tests/module/scripts/test_pshowkw.py) | 0 | ||||
-rw-r--r-- | tests/sync/__init__.py (renamed from tests/module/sync/__init__.py) | 0 | ||||
-rw-r--r-- | tests/sync/test_base.py (renamed from tests/module/sync/test_base.py) | 0 | ||||
-rw-r--r-- | tests/sync/test_bzr.py (renamed from tests/module/sync/test_bzr.py) | 0 | ||||
-rw-r--r-- | tests/sync/test_cvs.py (renamed from tests/module/sync/test_cvs.py) | 0 | ||||
-rw-r--r-- | tests/sync/test_darcs.py (renamed from tests/module/sync/test_darcs.py) | 0 | ||||
-rw-r--r-- | tests/sync/test_git.py (renamed from tests/module/sync/test_git.py) | 0 | ||||
-rw-r--r-- | tests/sync/test_git_svn.py (renamed from tests/module/sync/test_git_svn.py) | 0 | ||||
-rw-r--r-- | tests/sync/test_hg.py (renamed from tests/module/sync/test_hg.py) | 0 | ||||
-rw-r--r-- | tests/sync/test_rsync.py (renamed from tests/module/sync/test_rsync.py) | 0 | ||||
-rw-r--r-- | tests/sync/test_sqfs.py (renamed from tests/module/sync/test_sqfs.py) | 0 | ||||
-rw-r--r-- | tests/sync/test_svn.py (renamed from tests/module/sync/test_svn.py) | 0 | ||||
-rw-r--r-- | tests/sync/test_tar.py (renamed from tests/module/sync/test_tar.py) | 0 | ||||
-rw-r--r-- | tests/test_eq_hash_inheritance.py (renamed from tests/module/test_eq_hash_inheritance.py) | 0 | ||||
-rw-r--r-- | tests/test_gpg.py (renamed from tests/module/test_gpg.py) | 0 | ||||
-rw-r--r-- | tests/test_plugin.py (renamed from tests/module/test_plugin.py) | 4 | ||||
-rw-r--r-- | tests/test_slot_shadowing.py (renamed from tests/module/test_slot_shadowing.py) | 0 | ||||
-rw-r--r-- | tests/test_source_hygene.py (renamed from tests/module/test_source_hygene.py) | 0 | ||||
-rw-r--r-- | tests/util/__init__.py (renamed from tests/module/util/__init__.py) | 0 | ||||
-rw-r--r-- | tests/util/test_commandline.py (renamed from tests/module/util/test_commandline.py) | 6 | ||||
-rw-r--r-- | tests/util/test_parserestrict.py (renamed from tests/module/util/test_parserestrict.py) | 0 |
91 files changed, 53 insertions, 53 deletions
diff --git a/tests/module/__init__.py b/tests/__init__.py index e69de29b..e69de29b 100644 --- a/tests/module/__init__.py +++ b/tests/__init__.py diff --git a/tests/module/cache/__init__.py b/tests/cache/__init__.py index e69de29b..e69de29b 100644 --- a/tests/module/cache/__init__.py +++ b/tests/cache/__init__.py diff --git a/tests/module/cache/test_base.py b/tests/cache/test_base.py index 9af465fd..9af465fd 100644 --- a/tests/module/cache/test_base.py +++ b/tests/cache/test_base.py diff --git a/tests/module/cache/test_flat_hash.py b/tests/cache/test_flat_hash.py index b0758063..b0758063 100644 --- a/tests/module/cache/test_flat_hash.py +++ b/tests/cache/test_flat_hash.py diff --git a/tests/module/cache/test_util.py b/tests/cache/test_util.py index e28db9f3..e28db9f3 100644 --- a/tests/module/cache/test_util.py +++ b/tests/cache/test_util.py diff --git a/tests/module/config/__init__.py b/tests/config/__init__.py index e69de29b..e69de29b 100644 --- a/tests/module/config/__init__.py +++ b/tests/config/__init__.py diff --git a/tests/module/config/test_basics.py b/tests/config/test_basics.py index 412ff5ea..0e155a23 100644 --- a/tests/module/config/test_basics.py +++ b/tests/config/test_basics.py @@ -327,7 +327,7 @@ class FakeIncrementalDictConfigSectionTest(TestCase): self.assertEqual( ('list', [ ['whatever'], - ['module.config.test_basics.asis'], + ['tests.config.test_basics.asis'], None]), section.render_value(manager, 'strlist', 'repr')) self.assertRaises( @@ -342,7 +342,7 @@ class ConvertStringTest(TestCase): 'str': 'tests', 'bool': 'yes', 'list': '0 1 2', - 'callable': 'module.config.test_basics.passthrough', + 'callable': 'tests.config.test_basics.passthrough', } destination = { 'str': 'tests', diff --git a/tests/module/config/test_central.py b/tests/config/test_central.py index 9c824a94..233e420c 100644 --- a/tests/module/config/test_central.py +++ b/tests/config/test_central.py @@ -84,7 +84,7 @@ class ConfigManagerTest(TestCase): }]) self.check_error( "Collapsing section named 'rsync repo':\n" - "type module.config.test_central.repo needs settings for " + "type tests.config.test_central.repo needs settings for " "'cache'", self.get_config_obj, manager, 'repo', 'rsync repo') @@ -149,7 +149,7 @@ class ConfigManagerTest(TestCase): self.check_error( "Failed instantiating section 'myrepo':\n" "'No object returned' instantiating " - "module.config.test_central.noop", + "tests.config.test_central.noop", manager.collapse_named_section('myrepo').instantiate) def test_not_callable(self): @@ -173,7 +173,7 @@ class ConfigManagerTest(TestCase): }]) self.check_error( "Failed instantiating section 'myrepo':\n" - "Failed instantiating section 'myrepo': exception caught from 'module.config.test_central.myrepo':\n" + "Failed instantiating section 'myrepo': exception caught from 'tests.config.test_central.myrepo':\n" "I raised", self.get_config_obj, manager, 'myrepo', 'myrepo') @@ -185,7 +185,7 @@ class ConfigManagerTest(TestCase): }]) self.check_error( "Failed instantiating section 'myrepo':\n" - "Failed instantiating section 'myrepo': exception caught from 'module.config.test_central.myrepo':\n" + "Failed instantiating section 'myrepo': exception caught from 'tests.config.test_central.myrepo':\n" "I raised", self.get_config_obj, manager, 'myrepo', 'myrepo') manager = central.ConfigManager( @@ -193,7 +193,7 @@ class ConfigManagerTest(TestCase): }], debug=True) self.check_error( "Failed instantiating section 'myrepo':\n" - "Failed instantiating section 'myrepo': exception caught from 'module.config.test_central.myrepo':\n" + "Failed instantiating section 'myrepo': exception caught from 'tests.config.test_central.myrepo':\n" "I raised", self.get_config_obj, manager, 'myrepo', 'myrepo', klass=errors.ConfigurationError) @@ -301,13 +301,13 @@ class ConfigManagerTest(TestCase): for i in range(3): self.check_error( "Failed instantiating section 'spork':\n" - "Failed instantiating section 'spork': exception caught from 'module.config.test_central.myrepo':\n" + "Failed instantiating section 'spork': exception caught from 'tests.config.test_central.myrepo':\n" "'I suck', callable unset!", spork.instantiate) for i in range(3): self.check_error( "Failed instantiating section 'spork':\n" - "Failed instantiating section 'spork': exception caught from 'module.config.test_central.myrepo':\n" + "Failed instantiating section 'spork': exception caught from 'tests.config.test_central.myrepo':\n" "'I suck', callable unset!", manager.collapse_named_section('spork').instantiate) @@ -319,7 +319,7 @@ class ConfigManagerTest(TestCase): manager = central.ConfigManager( [{'spork': basics.HardCodedConfigSection({'class': myrepo}), 'drawer': basics.ConfigSectionFromStringDict({ - 'class': 'module.config.test_central.drawer', + 'class': 'tests.config.test_central.drawer', 'content': 'spork', }), }]) @@ -333,7 +333,7 @@ class ConfigManagerTest(TestCase): def test_collapse_named_errors(self): manager = central.ConfigManager( [{'spork': basics.ConfigSectionFromStringDict({ - 'class': 'module.config.test_central.drawer', + 'class': 'tests.config.test_central.drawer', 'content': 'ref'})}], [RemoteSource()]) self.assertRaises(KeyError, self.get_config_obj, manager, 'repo', 'foon') self.check_error( @@ -361,13 +361,13 @@ class ConfigManagerTest(TestCase): def test_recursive_section_ref(self): manager = central.ConfigManager( [{'spork': basics.ConfigSectionFromStringDict({ - 'class': 'module.config.test_central.drawer', + 'class': 'tests.config.test_central.drawer', 'content': 'foon'}), 'foon': basics.ConfigSectionFromStringDict({ - 'class': 'module.config.test_central.drawer', + 'class': 'tests.config.test_central.drawer', 'content': 'spork'}), 'self': basics.ConfigSectionFromStringDict({ - 'class': 'module.config.test_central.drawer', + 'class': 'tests.config.test_central.drawer', 'content': 'self'}), }]) self.check_error( @@ -386,10 +386,10 @@ class ConfigManagerTest(TestCase): def test_recursive_inherit(self): manager = central.ConfigManager( [{'spork': basics.ConfigSectionFromStringDict({ - 'class': 'module.config.test_central.drawer', + 'class': 'tests.config.test_central.drawer', 'inherit': 'foon'}), 'foon': basics.ConfigSectionFromStringDict({ - 'class': 'module.config.test_central.drawer', + 'class': 'tests.config.test_central.drawer', 'inherit': 'spork'}), }]) self.check_error( @@ -515,14 +515,14 @@ class ConfigManagerTest(TestCase): "Failed instantiating section 'one':\n" "Instantiating reference 'content' pointing at None:\n" "Failed instantiating section None:\n" - "Failed instantiating section None: exception caught from 'module.config.test_central.broken':\n" + "Failed instantiating section None: exception caught from 'tests.config.test_central.broken':\n" "'broken', callable unset!", manager.collapse_named_section('one').instantiate) self.check_error( "Failed instantiating section 'multi':\n" "Instantiating reference 'contents' pointing at None:\n" "Failed instantiating section None:\n" - "Failed instantiating section None: exception caught from 'module.config.test_central.broken':\n" + "Failed instantiating section None: exception caught from 'tests.config.test_central.broken':\n" "'broken', callable unset!", manager.collapse_named_section('multi').instantiate) @@ -533,7 +533,7 @@ class ConfigManagerTest(TestCase): self.check_error( "Failed loading autoload section 'autoload_broken':\n" "Failed instantiating section 'autoload_broken':\n" - "Failed instantiating section 'autoload_broken': exception caught from 'module.config.test_central.broken':\n" + "Failed instantiating section 'autoload_broken': exception caught from 'tests.config.test_central.broken':\n" "'broken', callable unset!", central.ConfigManager, [{ 'autoload_broken': basics.HardCodedConfigSection({ @@ -638,7 +638,7 @@ class ConfigManagerTest(TestCase): section = basics.HardCodedConfigSection({'inherit': ['self']}) manager = central.ConfigManager([{ 'self': basics.ConfigSectionFromStringDict({ - 'class': 'module.config.test_central.drawer', + 'class': 'tests.config.test_central.drawer', 'inherit': 'self'}), }], [RemoteSource()]) self.check_error( diff --git a/tests/module/config/test_cparser.py b/tests/config/test_cparser.py index e3851a35..e3851a35 100644 --- a/tests/module/config/test_cparser.py +++ b/tests/config/test_cparser.py diff --git a/tests/module/config/test_init.py b/tests/config/test_init.py index 99e7e7a4..9db5a7ac 100644 --- a/tests/module/config/test_init.py +++ b/tests/config/test_init.py @@ -20,7 +20,7 @@ class ConfigLoadingTest(TestCase): self.user_config = mk_named_tempfile() self.user_config.write( '[foo]\n' - 'class = module.config.test_init.passthrough\n' + 'class = tests.config.test_init.passthrough\n' ) self.user_config.flush() self.system_config = mk_named_tempfile() diff --git a/tests/module/ebuild/__init__.py b/tests/ebuild/__init__.py index e69de29b..e69de29b 100644 --- a/tests/module/ebuild/__init__.py +++ b/tests/ebuild/__init__.py diff --git a/tests/module/ebuild/test_atom.py b/tests/ebuild/test_atom.py index c051e06f..c051e06f 100644 --- a/tests/module/ebuild/test_atom.py +++ b/tests/ebuild/test_atom.py diff --git a/tests/module/ebuild/test_conditionals.py b/tests/ebuild/test_conditionals.py index 8cccb734..8cccb734 100644 --- a/tests/module/ebuild/test_conditionals.py +++ b/tests/ebuild/test_conditionals.py diff --git a/tests/module/ebuild/test_cpv.py b/tests/ebuild/test_cpv.py index ccfe4279..ccfe4279 100644 --- a/tests/module/ebuild/test_cpv.py +++ b/tests/ebuild/test_cpv.py diff --git a/tests/module/ebuild/test_digest.py b/tests/ebuild/test_digest.py index 40a8e268..40a8e268 100644 --- a/tests/module/ebuild/test_digest.py +++ b/tests/ebuild/test_digest.py diff --git a/tests/module/ebuild/test_eapi.py b/tests/ebuild/test_eapi.py index e0ab82d7..e0ab82d7 100644 --- a/tests/module/ebuild/test_eapi.py +++ b/tests/ebuild/test_eapi.py diff --git a/tests/module/ebuild/test_ebuild_src.py b/tests/ebuild/test_ebuild_src.py index 3d4875d8..3d4875d8 100644 --- a/tests/module/ebuild/test_ebuild_src.py +++ b/tests/ebuild/test_ebuild_src.py diff --git a/tests/module/ebuild/test_eclass_cache.py b/tests/ebuild/test_eclass_cache.py index bbbffae9..bbbffae9 100644 --- a/tests/module/ebuild/test_eclass_cache.py +++ b/tests/ebuild/test_eclass_cache.py diff --git a/tests/module/ebuild/test_filter_env.py b/tests/ebuild/test_filter_env.py index 77db44be..77db44be 100644 --- a/tests/module/ebuild/test_filter_env.py +++ b/tests/ebuild/test_filter_env.py diff --git a/tests/module/ebuild/test_formatter.py b/tests/ebuild/test_formatter.py index 800197ba..800197ba 100644 --- a/tests/module/ebuild/test_formatter.py +++ b/tests/ebuild/test_formatter.py diff --git a/tests/module/ebuild/test_misc.py b/tests/ebuild/test_misc.py index 3af5e5c5..3af5e5c5 100644 --- a/tests/module/ebuild/test_misc.py +++ b/tests/ebuild/test_misc.py diff --git a/tests/module/ebuild/test_portage_conf.py b/tests/ebuild/test_portage_conf.py index 1997825e..1997825e 100644 --- a/tests/module/ebuild/test_portage_conf.py +++ b/tests/ebuild/test_portage_conf.py diff --git a/tests/module/ebuild/test_profiles.py b/tests/ebuild/test_profiles.py index 00fcd780..00fcd780 100644 --- a/tests/module/ebuild/test_profiles.py +++ b/tests/ebuild/test_profiles.py diff --git a/tests/module/ebuild/test_repo_objs.py b/tests/ebuild/test_repo_objs.py index 9c5899f2..9c5899f2 100644 --- a/tests/module/ebuild/test_repo_objs.py +++ b/tests/ebuild/test_repo_objs.py diff --git a/tests/module/ebuild/test_repository.py b/tests/ebuild/test_repository.py index 9a91b97b..9a91b97b 100644 --- a/tests/module/ebuild/test_repository.py +++ b/tests/ebuild/test_repository.py diff --git a/tests/module/fetch/__init__.py b/tests/fetch/__init__.py index e69de29b..e69de29b 100644 --- a/tests/module/fetch/__init__.py +++ b/tests/fetch/__init__.py diff --git a/tests/module/fetch/test_base.py b/tests/fetch/test_base.py index e6a7459f..e6a7459f 100644 --- a/tests/module/fetch/test_base.py +++ b/tests/fetch/test_base.py diff --git a/tests/module/fetch/test_init.py b/tests/fetch/test_init.py index 57f549df..57f549df 100644 --- a/tests/module/fetch/test_init.py +++ b/tests/fetch/test_init.py diff --git a/tests/module/fs/__init__.py b/tests/fs/__init__.py index e69de29b..e69de29b 100644 --- a/tests/module/fs/__init__.py +++ b/tests/fs/__init__.py diff --git a/tests/module/fs/fs_util.py b/tests/fs/fs_util.py index b955f3fb..b955f3fb 100644 --- a/tests/module/fs/fs_util.py +++ b/tests/fs/fs_util.py diff --git a/tests/module/fs/test_contents.py b/tests/fs/test_contents.py index bffb9224..bffb9224 100644 --- a/tests/module/fs/test_contents.py +++ b/tests/fs/test_contents.py diff --git a/tests/module/fs/test_fs.py b/tests/fs/test_fs.py index a4c55b07..a4c55b07 100644 --- a/tests/module/fs/test_fs.py +++ b/tests/fs/test_fs.py diff --git a/tests/module/fs/test_livefs.py b/tests/fs/test_livefs.py index c416c9b1..c416c9b1 100644 --- a/tests/module/fs/test_livefs.py +++ b/tests/fs/test_livefs.py diff --git a/tests/module/fs/test_ops.py b/tests/fs/test_ops.py index 038548ea..038548ea 100644 --- a/tests/module/fs/test_ops.py +++ b/tests/fs/test_ops.py diff --git a/tests/module/merge/__init__.py b/tests/merge/__init__.py index e69de29b..e69de29b 100644 --- a/tests/module/merge/__init__.py +++ b/tests/merge/__init__.py diff --git a/tests/module/merge/test_engine.py b/tests/merge/test_engine.py index 16e29cab..16e29cab 100644 --- a/tests/module/merge/test_engine.py +++ b/tests/merge/test_engine.py diff --git a/tests/module/merge/test_triggers.py b/tests/merge/test_triggers.py index 241b6e63..241b6e63 100644 --- a/tests/module/merge/test_triggers.py +++ b/tests/merge/test_triggers.py diff --git a/tests/module/merge/util.py b/tests/merge/util.py index 3e1cf436..3e1cf436 100644 --- a/tests/module/merge/util.py +++ b/tests/merge/util.py diff --git a/tests/module/package/__init__.py b/tests/package/__init__.py index e69de29b..e69de29b 100644 --- a/tests/module/package/__init__.py +++ b/tests/package/__init__.py diff --git a/tests/module/package/test_base.py b/tests/package/test_base.py index 63dab2f3..63dab2f3 100644 --- a/tests/module/package/test_base.py +++ b/tests/package/test_base.py diff --git a/tests/module/package/test_metadata.py b/tests/package/test_metadata.py index a697d411..a697d411 100644 --- a/tests/module/package/test_metadata.py +++ b/tests/package/test_metadata.py diff --git a/tests/module/package/test_mutated.py b/tests/package/test_mutated.py index ba0c3d1b..ba0c3d1b 100644 --- a/tests/module/package/test_mutated.py +++ b/tests/package/test_mutated.py diff --git a/tests/module/pkgsets/__init__.py b/tests/pkgsets/__init__.py index e69de29b..e69de29b 100644 --- a/tests/module/pkgsets/__init__.py +++ b/tests/pkgsets/__init__.py diff --git a/tests/module/pkgsets/test_filelist.py b/tests/pkgsets/test_filelist.py index 216bb440..216bb440 100644 --- a/tests/module/pkgsets/test_filelist.py +++ b/tests/pkgsets/test_filelist.py diff --git a/tests/module/pkgsets/test_glsa.py b/tests/pkgsets/test_glsa.py index b692d9d9..b692d9d9 100644 --- a/tests/module/pkgsets/test_glsa.py +++ b/tests/pkgsets/test_glsa.py diff --git a/tests/module/pkgsets/test_installed.py b/tests/pkgsets/test_installed.py index 8d5a32f2..8d5a32f2 100644 --- a/tests/module/pkgsets/test_installed.py +++ b/tests/pkgsets/test_installed.py diff --git a/tests/module/repository/__init__.py b/tests/repository/__init__.py index e69de29b..e69de29b 100644 --- a/tests/module/repository/__init__.py +++ b/tests/repository/__init__.py diff --git a/tests/module/repository/test_filtered.py b/tests/repository/test_filtered.py index 083ec93d..083ec93d 100644 --- a/tests/module/repository/test_filtered.py +++ b/tests/repository/test_filtered.py diff --git a/tests/module/repository/test_multiplex.py b/tests/repository/test_multiplex.py index 10b26cc4..10b26cc4 100644 --- a/tests/module/repository/test_multiplex.py +++ b/tests/repository/test_multiplex.py diff --git a/tests/module/repository/test_prototype.py b/tests/repository/test_prototype.py index 1f29c667..1f29c667 100644 --- a/tests/module/repository/test_prototype.py +++ b/tests/repository/test_prototype.py diff --git a/tests/module/resolver/__init__.py b/tests/resolver/__init__.py index e69de29b..e69de29b 100644 --- a/tests/module/resolver/__init__.py +++ b/tests/resolver/__init__.py diff --git a/tests/module/resolver/test_choice_point.py b/tests/resolver/test_choice_point.py index 1544304f..1544304f 100644 --- a/tests/module/resolver/test_choice_point.py +++ b/tests/resolver/test_choice_point.py diff --git a/tests/module/resolver/test_pigeonholes.py b/tests/resolver/test_pigeonholes.py index 1238b473..1238b473 100644 --- a/tests/module/resolver/test_pigeonholes.py +++ b/tests/resolver/test_pigeonholes.py diff --git a/tests/module/resolver/test_plan.py b/tests/resolver/test_plan.py index ed74fdb0..ed74fdb0 100644 --- a/tests/module/resolver/test_plan.py +++ b/tests/resolver/test_plan.py diff --git a/tests/module/restrictions/__init__.py b/tests/restrictions/__init__.py index e69de29b..e69de29b 100644 --- a/tests/module/restrictions/__init__.py +++ b/tests/restrictions/__init__.py diff --git a/tests/module/restrictions/test_boolean.py b/tests/restrictions/test_boolean.py index 5f998f04..5f998f04 100644 --- a/tests/module/restrictions/test_boolean.py +++ b/tests/restrictions/test_boolean.py diff --git a/tests/module/restrictions/test_delegated.py b/tests/restrictions/test_delegated.py index e392707e..e392707e 100644 --- a/tests/module/restrictions/test_delegated.py +++ b/tests/restrictions/test_delegated.py diff --git a/tests/module/restrictions/test_packages.py b/tests/restrictions/test_packages.py index b716073e..b716073e 100644 --- a/tests/module/restrictions/test_packages.py +++ b/tests/restrictions/test_packages.py diff --git a/tests/module/restrictions/test_restriction.py b/tests/restrictions/test_restriction.py index 03305bc7..03305bc7 100644 --- a/tests/module/restrictions/test_restriction.py +++ b/tests/restrictions/test_restriction.py diff --git a/tests/module/restrictions/test_util.py b/tests/restrictions/test_util.py index 5e125d7e..5e125d7e 100644 --- a/tests/module/restrictions/test_util.py +++ b/tests/restrictions/test_util.py diff --git a/tests/module/restrictions/test_values.py b/tests/restrictions/test_values.py index 2571f45d..2571f45d 100644 --- a/tests/module/restrictions/test_values.py +++ b/tests/restrictions/test_values.py diff --git a/tests/module/scripts/__init__.py b/tests/scripts/__init__.py index e69de29b..e69de29b 100644 --- a/tests/module/scripts/__init__.py +++ b/tests/scripts/__init__.py diff --git a/tests/module/scripts/test_pclean.py b/tests/scripts/test_pclean.py index e776dea8..e776dea8 100644 --- a/tests/module/scripts/test_pclean.py +++ b/tests/scripts/test_pclean.py diff --git a/tests/module/scripts/test_pclonecache.py b/tests/scripts/test_pclonecache.py index 332f1177..332f1177 100644 --- a/tests/module/scripts/test_pclonecache.py +++ b/tests/scripts/test_pclonecache.py diff --git a/tests/module/scripts/test_pconfig.py b/tests/scripts/test_pconfig.py index b4fc544e..7dd08404 100644 --- a/tests/module/scripts/test_pconfig.py +++ b/tests/scripts/test_pconfig.py @@ -69,19 +69,19 @@ class DescribeClassTest(ArgParseMixin): 'Test thing.', '', 'reff: ref:spork (required)'], - 'module.scripts.test_pconfig.spork') + 'tests.scripts.test_pconfig.spork') self.assertOut( ['typename is increment', 'Noop.', 'values not listed are handled as strings', '', 'inc: list'], - 'module.scripts.test_pconfig.increment') + 'tests.scripts.test_pconfig.increment') def test_broken_type(self): self.assertErr( ['Not a valid type!'], - 'module.scripts.test_pconfig.broken_type') + 'tests.scripts.test_pconfig.broken_type') class ClassesTest(TestCase, ArgParseMixin): @@ -97,18 +97,18 @@ class ClassesTest(TestCase, ArgParseMixin): noop.__name__ = str(i) sections.append(basics.HardCodedConfigSection({'class': noop})) self.assertOut( - ['module.scripts.test_pconfig.foon'], + ['tests.scripts.test_pconfig.foon'], spork=basics.HardCodedConfigSection({'class': foon})) self.assertOut([ - 'module.scripts.test_pconfig.0', - 'module.scripts.test_pconfig.1', - 'module.scripts.test_pconfig.2', - 'module.scripts.test_pconfig.3', - 'module.scripts.test_pconfig.4', - 'module.scripts.test_pconfig.5', - 'module.scripts.test_pconfig.multi', - 'module.scripts.test_pconfig.pseudospork', - 'module.scripts.test_pconfig.spork', + 'tests.scripts.test_pconfig.0', + 'tests.scripts.test_pconfig.1', + 'tests.scripts.test_pconfig.2', + 'tests.scripts.test_pconfig.3', + 'tests.scripts.test_pconfig.4', + 'tests.scripts.test_pconfig.5', + 'tests.scripts.test_pconfig.multi', + 'tests.scripts.test_pconfig.pseudospork', + 'tests.scripts.test_pconfig.spork', ], bork=basics.HardCodedConfigSection({ 'class': pseudospork, 'bork': True, 'inherit-only': True}), @@ -134,7 +134,7 @@ class DumpTest(TestCase, ArgParseMixin): self.assertOut( ["'spork' {", ' # typename of this section: foon', - ' class module.scripts.test_pconfig.foon;', + ' class tests.scripts.test_pconfig.foon;', '}', ''], spork=basics.HardCodedConfigSection({'class': foon})) @@ -143,7 +143,7 @@ class DumpTest(TestCase, ArgParseMixin): self.assertOut( ["'spork' {", ' # typename of this section: foon', - ' class module.scripts.test_pconfig.foon;', + ' class tests.scripts.test_pconfig.foon;', ' default true;', '}', ''], @@ -161,38 +161,38 @@ class DumpTest(TestCase, ArgParseMixin): self.assertOut( ["'spork' {", ' # typename of this section: multi', - ' class module.scripts.test_pconfig.multi;', + ' class tests.scripts.test_pconfig.multi;', ' # type: bool', ' boolean True;', ' # type: callable', - ' callable module.scripts.test_pconfig.multi;', + ' callable tests.scripts.test_pconfig.multi;', ' # type: lazy_ref:spork', ' lazy_ref {', ' # typename of this section: spork', - ' class module.scripts.test_pconfig.pseudospork;', + ' class tests.scripts.test_pconfig.pseudospork;', ' };', ' # type: lazy_refs:spork', ' lazy_refs {', ' # typename of this section: spork', - ' class module.scripts.test_pconfig.pseudospork;', + ' class tests.scripts.test_pconfig.pseudospork;', ' } {', ' # typename of this section: spork', - ' class module.scripts.test_pconfig.pseudospork;', + ' class tests.scripts.test_pconfig.pseudospork;', ' };', ' # type: list', " list 'a' 'b\\' \"c';", ' # type: ref:spork', ' ref {', ' # typename of this section: spork', - ' class module.scripts.test_pconfig.pseudospork;', + ' class tests.scripts.test_pconfig.pseudospork;', ' };', ' # type: refs:spork', ' refs {', ' # typename of this section: spork', - ' class module.scripts.test_pconfig.pseudospork;', + ' class tests.scripts.test_pconfig.pseudospork;', ' } {', ' # typename of this section: spork', - ' class module.scripts.test_pconfig.pseudospork;', + ' class tests.scripts.test_pconfig.pseudospork;', ' };', ' # type: str', ' string \'it is a "stringy" \\\'string\\\'\';', @@ -217,7 +217,7 @@ class DumpTest(TestCase, ArgParseMixin): self.assertOut( ["'spork' {", ' # typename of this section: spork', - ' class module.scripts.test_pconfig.pseudospork;', + ' class tests.scripts.test_pconfig.pseudospork;', '}', '', ], @@ -240,7 +240,7 @@ class UncollapsableTest(TestCase, ArgParseMixin): "", "section spork:", " Collapsing section named 'spork'", - " type module.scripts.test_pconfig.spork needs settings for 'reff'" + " type tests.scripts.test_pconfig.spork needs settings for 'reff'" "", "", ], @@ -299,7 +299,7 @@ class DumpUncollapsedTest(TestCase, ArgParseMixin): 'foon', '====', '# type: callable', - "'class' = module.scripts.test_pconfigspork", + "'class' = tests.scripts.test_pconfigspork", '# type: bool', "'inherit-only' = True", '# type: refs', @@ -331,7 +331,7 @@ class DumpUncollapsedTest(TestCase, ArgParseMixin): 'spork', '=====', '# type: callable', - "'class' = module.scripts.test_pconfigspork", + "'class' = tests.scripts.test_pconfigspork", '', ], spork=basics.HardCodedConfigSection({'class': spork}), diff --git a/tests/module/scripts/test_pebuild.py b/tests/scripts/test_pebuild.py index 4419c66c..4419c66c 100644 --- a/tests/module/scripts/test_pebuild.py +++ b/tests/scripts/test_pebuild.py diff --git a/tests/module/scripts/test_pmaint.py b/tests/scripts/test_pmaint.py index 75cb0557..75cb0557 100644 --- a/tests/module/scripts/test_pmaint.py +++ b/tests/scripts/test_pmaint.py diff --git a/tests/module/scripts/test_pmerge.py b/tests/scripts/test_pmerge.py index 48c32a7a..48c32a7a 100644 --- a/tests/module/scripts/test_pmerge.py +++ b/tests/scripts/test_pmerge.py diff --git a/tests/module/scripts/test_pplugincache.py b/tests/scripts/test_pplugincache.py index c194073c..c194073c 100644 --- a/tests/module/scripts/test_pplugincache.py +++ b/tests/scripts/test_pplugincache.py diff --git a/tests/module/scripts/test_pquery.py b/tests/scripts/test_pquery.py index eaae3e64..eaae3e64 100644 --- a/tests/module/scripts/test_pquery.py +++ b/tests/scripts/test_pquery.py diff --git a/tests/module/scripts/test_pshowkw.py b/tests/scripts/test_pshowkw.py index 0ccfcb76..0ccfcb76 100644 --- a/tests/module/scripts/test_pshowkw.py +++ b/tests/scripts/test_pshowkw.py diff --git a/tests/module/sync/__init__.py b/tests/sync/__init__.py index e69de29b..e69de29b 100644 --- a/tests/module/sync/__init__.py +++ b/tests/sync/__init__.py diff --git a/tests/module/sync/test_base.py b/tests/sync/test_base.py index dc8e4152..dc8e4152 100644 --- a/tests/module/sync/test_base.py +++ b/tests/sync/test_base.py diff --git a/tests/module/sync/test_bzr.py b/tests/sync/test_bzr.py index d720f933..d720f933 100644 --- a/tests/module/sync/test_bzr.py +++ b/tests/sync/test_bzr.py diff --git a/tests/module/sync/test_cvs.py b/tests/sync/test_cvs.py index 76bfa062..76bfa062 100644 --- a/tests/module/sync/test_cvs.py +++ b/tests/sync/test_cvs.py diff --git a/tests/module/sync/test_darcs.py b/tests/sync/test_darcs.py index ab63b848..ab63b848 100644 --- a/tests/module/sync/test_darcs.py +++ b/tests/sync/test_darcs.py diff --git a/tests/module/sync/test_git.py b/tests/sync/test_git.py index 5e63dfcc..5e63dfcc 100644 --- a/tests/module/sync/test_git.py +++ b/tests/sync/test_git.py diff --git a/tests/module/sync/test_git_svn.py b/tests/sync/test_git_svn.py index 2ca77109..2ca77109 100644 --- a/tests/module/sync/test_git_svn.py +++ b/tests/sync/test_git_svn.py diff --git a/tests/module/sync/test_hg.py b/tests/sync/test_hg.py index 37e188b2..37e188b2 100644 --- a/tests/module/sync/test_hg.py +++ b/tests/sync/test_hg.py diff --git a/tests/module/sync/test_rsync.py b/tests/sync/test_rsync.py index 02b1a42d..02b1a42d 100644 --- a/tests/module/sync/test_rsync.py +++ b/tests/sync/test_rsync.py diff --git a/tests/module/sync/test_sqfs.py b/tests/sync/test_sqfs.py index 9972448a..9972448a 100644 --- a/tests/module/sync/test_sqfs.py +++ b/tests/sync/test_sqfs.py diff --git a/tests/module/sync/test_svn.py b/tests/sync/test_svn.py index 0f8a14d4..0f8a14d4 100644 --- a/tests/module/sync/test_svn.py +++ b/tests/sync/test_svn.py diff --git a/tests/module/sync/test_tar.py b/tests/sync/test_tar.py index a6ddaa10..a6ddaa10 100644 --- a/tests/module/sync/test_tar.py +++ b/tests/sync/test_tar.py diff --git a/tests/module/test_eq_hash_inheritance.py b/tests/test_eq_hash_inheritance.py index 86b3c558..86b3c558 100644 --- a/tests/module/test_eq_hash_inheritance.py +++ b/tests/test_eq_hash_inheritance.py diff --git a/tests/module/test_gpg.py b/tests/test_gpg.py index f5fd2991..f5fd2991 100644 --- a/tests/module/test_gpg.py +++ b/tests/test_gpg.py diff --git a/tests/module/test_plugin.py b/tests/test_plugin.py index 0e96980e..83278ff9 100644 --- a/tests/module/test_plugin.py +++ b/tests/test_plugin.py @@ -59,7 +59,7 @@ pkgcore_plugins = { 'plugtest': [ DisabledPlug, high_plug, - 'module.test_plugin.LowPlug', + 'tests.test_plugin.LowPlug', ] } ''') @@ -136,7 +136,7 @@ pkgcore_plugins = {'plugtest': [HiddenPlug]} assert f'plug2:{mtime}:\n' == lines[0] mtime = int(os.path.getmtime(pjoin(self.packdir, 'plug.py'))) assert ( - f'plug:{mtime}:plugtest,7,1:plugtest,1,module.test_plugin.LowPlug:plugtest,0,0\n' + f'plug:{mtime}:plugtest,7,1:plugtest,1,tests.test_plugin.LowPlug:plugtest,0,0\n' == lines[1]) def test_plug(self): diff --git a/tests/module/test_slot_shadowing.py b/tests/test_slot_shadowing.py index fa47e291..fa47e291 100644 --- a/tests/module/test_slot_shadowing.py +++ b/tests/test_slot_shadowing.py diff --git a/tests/module/test_source_hygene.py b/tests/test_source_hygene.py index cafa02d2..cafa02d2 100644 --- a/tests/module/test_source_hygene.py +++ b/tests/test_source_hygene.py diff --git a/tests/module/util/__init__.py b/tests/util/__init__.py index e69de29b..e69de29b 100644 --- a/tests/module/util/__init__.py +++ b/tests/util/__init__.py diff --git a/tests/module/util/test_commandline.py b/tests/util/test_commandline.py index 9c45b23f..33daded8 100644 --- a/tests/module/util/test_commandline.py +++ b/tests/util/test_commandline.py @@ -59,15 +59,15 @@ class TestModifyConfig(ArgParseMixin): def test_modify_config(self): namespace = self.parse( '--empty-config', '--new-config', - 'foo', 'class', 'module.util.test_commandline.sect', + 'foo', 'class', 'tests.util.test_commandline.sect', '--trigger') assert namespace.config.collapse_named_section('foo') namespace = self.parse( '--empty-config', '--new-config', - 'foo', 'class', 'module.util.test_commandline.missing', + 'foo', 'class', 'tests.util.test_commandline.missing', '--add-config', 'foo', 'class', - 'module.util.test_commandline.sect', + 'tests.util.test_commandline.sect', '--trigger') assert namespace.config.collapse_named_section('foo') diff --git a/tests/module/util/test_parserestrict.py b/tests/util/test_parserestrict.py index d967d53a..d967d53a 100644 --- a/tests/module/util/test_parserestrict.py +++ b/tests/util/test_parserestrict.py |