commit: 26b0c883ec203153a366f520f71dbd824b304e45 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Nov 11 06:00:01 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Nov 11 07:24:03 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=26b0c883
portage: tests: fix typos Thanks to codespell. Signed-off-by: Sam James <sam <AT> gentoo.org> lib/portage/tests/bin/test_doins.py | 8 ++++---- lib/portage/tests/ebuild/test_spawn.py | 2 +- lib/portage/tests/gpkg/test_gpkg_checksum.py | 2 +- lib/portage/tests/gpkg/test_gpkg_gpg.py | 2 +- lib/portage/tests/gpkg/test_gpkg_metadata_update.py | 2 +- lib/portage/tests/gpkg/test_gpkg_metadata_url.py | 2 +- lib/portage/tests/gpkg/test_gpkg_path.py | 2 +- lib/portage/tests/gpkg/test_gpkg_size.py | 2 +- lib/portage/tests/gpkg/test_gpkg_stream.py | 2 +- lib/portage/tests/lafilefixer/test_lafilefixer.py | 4 ++-- lib/portage/tests/resolver/ResolverPlayground.py | 2 +- lib/portage/tests/resolver/test_autounmask_binpkg_use.py | 2 +- lib/portage/tests/resolver/test_circular_choices_rust.py | 2 +- lib/portage/tests/resolver/test_depclean_slot_unavailable.py | 2 +- lib/portage/tests/unicode/test_string_format.py | 2 +- lib/portage/tests/util/futures/asyncio/test_pipe_closed.py | 4 ++-- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lib/portage/tests/bin/test_doins.py b/lib/portage/tests/bin/test_doins.py index 3b4b9d2b27..75a93ef9be 100644 --- a/lib/portage/tests/bin/test_doins.py +++ b/lib/portage/tests/bin/test_doins.py @@ -16,7 +16,7 @@ exists_in_D = setup_env.exists_in_D class DoIns(setup_env.BinTestCase): def testDoIns(self): - """Tests the most basic senario.""" + """Tests the most basic scenario.""" self.init() try: env = setup_env.env @@ -98,7 +98,7 @@ class DoIns(setup_env.BinTestCase): pass uid = os.lstat(os.path.join(env["S"], "test")).st_uid pw = pwd.getpwuid(uid) - # Similary to testDoInsOptionUid, use user name. + # Similarly to testDoInsOptionUid, use user name. env["INSOPTIONS"] = f"-o {pw.pw_name}" doins("test") st = os.lstat(env["D"] + "/test") @@ -115,7 +115,7 @@ class DoIns(setup_env.BinTestCase): with open(os.path.join(env["S"], "test"), "w"): pass gid = os.lstat(os.path.join(env["S"], "test")).st_gid - # Similary to testDoInsOptionUid, use gid. + # Similarly to testDoInsOptionUid, use gid. env["INSOPTIONS"] = "-g %d" % gid doins("test") st = os.lstat(env["D"] + "/test") @@ -133,7 +133,7 @@ class DoIns(setup_env.BinTestCase): pass gid = os.lstat(os.path.join(env["S"], "test")).st_gid gr = grp.getgrgid(gid) - # Similary to testDoInsOptionUid, use group name. + # Similarly to testDoInsOptionUid, use group name. env["INSOPTIONS"] = f"-g {gr.gr_name}" doins("test") st = os.lstat(env["D"] + "/test") diff --git a/lib/portage/tests/ebuild/test_spawn.py b/lib/portage/tests/ebuild/test_spawn.py index 2c9e503490..c73171f04a 100644 --- a/lib/portage/tests/ebuild/test_spawn.py +++ b/lib/portage/tests/ebuild/test_spawn.py @@ -40,7 +40,7 @@ class SpawnTestCase(TestCase): f.close() # When logging passes through a pty, this comparison will fail # unless the oflag terminal attributes have the termios.OPOST - # bit disabled. Otherwise, tranformations such as \n -> \r\n + # bit disabled. Otherwise, transformations such as \n -> \r\n # may occur. self.assertEqual(test_string, log_content) finally: diff --git a/lib/portage/tests/gpkg/test_gpkg_checksum.py b/lib/portage/tests/gpkg/test_gpkg_checksum.py index be4b08661f..ba80aefa74 100644 --- a/lib/portage/tests/gpkg/test_gpkg_checksum.py +++ b/lib/portage/tests/gpkg/test_gpkg_checksum.py @@ -1,4 +1,4 @@ -# Copright Gentoo Foundation 2006-2020 +# Copyright Gentoo Foundation 2006-2020 # Portage Unit Testing Functionality import io diff --git a/lib/portage/tests/gpkg/test_gpkg_gpg.py b/lib/portage/tests/gpkg/test_gpkg_gpg.py index 442764d7e3..a2dc92150b 100644 --- a/lib/portage/tests/gpkg/test_gpkg_gpg.py +++ b/lib/portage/tests/gpkg/test_gpkg_gpg.py @@ -1,4 +1,4 @@ -# Copright Gentoo Foundation 2006-2020 +# Copyright Gentoo Foundation 2006-2020 # Portage Unit Testing Functionality import io diff --git a/lib/portage/tests/gpkg/test_gpkg_metadata_update.py b/lib/portage/tests/gpkg/test_gpkg_metadata_update.py index 99656499c9..d2da630f3d 100644 --- a/lib/portage/tests/gpkg/test_gpkg_metadata_update.py +++ b/lib/portage/tests/gpkg/test_gpkg_metadata_update.py @@ -1,4 +1,4 @@ -# Copright Gentoo Foundation 2006-2020 +# Copyright Gentoo Foundation 2006-2020 # Portage Unit Testing Functionality import tempfile diff --git a/lib/portage/tests/gpkg/test_gpkg_metadata_url.py b/lib/portage/tests/gpkg/test_gpkg_metadata_url.py index 68e810a406..4b9f68a929 100644 --- a/lib/portage/tests/gpkg/test_gpkg_metadata_url.py +++ b/lib/portage/tests/gpkg/test_gpkg_metadata_url.py @@ -1,4 +1,4 @@ -# Copright Gentoo Foundation 2006-2020 +# Copyright Gentoo Foundation 2006-2020 # Portage Unit Testing Functionality import io diff --git a/lib/portage/tests/gpkg/test_gpkg_path.py b/lib/portage/tests/gpkg/test_gpkg_path.py index 64275919b4..fc57135949 100644 --- a/lib/portage/tests/gpkg/test_gpkg_path.py +++ b/lib/portage/tests/gpkg/test_gpkg_path.py @@ -1,4 +1,4 @@ -# Copright Gentoo Foundation 2006 +# Copyright Gentoo Foundation 2006 # Portage Unit Testing Functionality import tempfile diff --git a/lib/portage/tests/gpkg/test_gpkg_size.py b/lib/portage/tests/gpkg/test_gpkg_size.py index 84f64fe92b..9a4ff0574b 100644 --- a/lib/portage/tests/gpkg/test_gpkg_size.py +++ b/lib/portage/tests/gpkg/test_gpkg_size.py @@ -1,4 +1,4 @@ -# Copright Gentoo Foundation 2006-2020 +# Copyright Gentoo Foundation 2006-2020 # Portage Unit Testing Functionality import tempfile diff --git a/lib/portage/tests/gpkg/test_gpkg_stream.py b/lib/portage/tests/gpkg/test_gpkg_stream.py index ed1d6ebb93..040590e494 100644 --- a/lib/portage/tests/gpkg/test_gpkg_stream.py +++ b/lib/portage/tests/gpkg/test_gpkg_stream.py @@ -1,4 +1,4 @@ -# Copright Gentoo Foundation 2006-2020 +# Copyright Gentoo Foundation 2006-2020 # Portage Unit Testing Functionality import tempfile diff --git a/lib/portage/tests/lafilefixer/test_lafilefixer.py b/lib/portage/tests/lafilefixer/test_lafilefixer.py index d52782fb57..c3bc677018 100644 --- a/lib/portage/tests/lafilefixer/test_lafilefixer.py +++ b/lib/portage/tests/lafilefixer/test_lafilefixer.py @@ -34,9 +34,9 @@ class test_lafilefixer(TestCase): yield b"" # no dependency_libs yield b"dlname='libfoo.so.1'\n" + b"current=6\n" + b"age=0\n" + b"revision=2\n" - # borken dependency_libs + # broken dependency_libs yield b"dlname='libfoo.so.1'\n" + b"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + b"old_library='libpdf.a'\n" + b"dependency_libs=' /usr/lib64/liba.la /usr/lib64/libb.la -lc' \n" - # borken dependency_libs + # broken dependency_libs yield b"dlname='libfoo.so.1'\n" + b"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + b"old_library='libpdf.a'\n" + b"dependency_libs=' /usr/lib64/liba.la /usr/lib64/libb.la -lc\n" # crap in dependency_libs yield b"dlname='libfoo.so.1'\n" + b"library_names='libfoo.so.1.0.2 libfoo.so.1 libfoo.so'\n" + b"old_library='libpdf.a'\n" + b"dependency_libs=' /usr/lib64/liba.la /usr/lib64/libb.la -lc /-lstdc++'\n" diff --git a/lib/portage/tests/resolver/ResolverPlayground.py b/lib/portage/tests/resolver/ResolverPlayground.py index 167e1e4608..475c4aaac5 100644 --- a/lib/portage/tests/resolver/ResolverPlayground.py +++ b/lib/portage/tests/resolver/ResolverPlayground.py @@ -336,7 +336,7 @@ class ResolverPlayground: raise AssertionError(f"digest creation failed for {ebuild_path}") def _create_binpkgs(self, binpkgs): - # When using BUILD_ID, there can be mutiple instances for the + # When using BUILD_ID, there can be multiple instances for the # same cpv. Therefore, binpkgs may be an iterable instead of # a dict. items = getattr(binpkgs, "items", None) diff --git a/lib/portage/tests/resolver/test_autounmask_binpkg_use.py b/lib/portage/tests/resolver/test_autounmask_binpkg_use.py index 40dc48a7b0..53dd18ab93 100644 --- a/lib/portage/tests/resolver/test_autounmask_binpkg_use.py +++ b/lib/portage/tests/resolver/test_autounmask_binpkg_use.py @@ -42,7 +42,7 @@ class AutounmaskBinpkgUseTestCase(TestCase): test_cases = ( # Bug 619626: Test for unnecessary rebuild due # to rejection of binary packages that would - # be acceptable after appplication of autounmask + # be acceptable after application of autounmask # USE changes. ResolverPlaygroundTestCase( ["dev-libs/A"], diff --git a/lib/portage/tests/resolver/test_circular_choices_rust.py b/lib/portage/tests/resolver/test_circular_choices_rust.py index c984bd5a0a..0c479ce850 100644 --- a/lib/portage/tests/resolver/test_circular_choices_rust.py +++ b/lib/portage/tests/resolver/test_circular_choices_rust.py @@ -42,7 +42,7 @@ class CircularRustTestCase(TestCase): # when a package would replace its own builtime dependency. # This needs to be tested with and without --update, since # that affects package selection logic significantly, - # expecially for packages given as arguments. + # especially for packages given as arguments. ResolverPlaygroundTestCase( ["=dev-lang/rust-1.46*"], mergelist=["dev-lang/rust-1.46.0"], diff --git a/lib/portage/tests/resolver/test_depclean_slot_unavailable.py b/lib/portage/tests/resolver/test_depclean_slot_unavailable.py index f61670cf67..ba4ea0a0e9 100644 --- a/lib/portage/tests/resolver/test_depclean_slot_unavailable.py +++ b/lib/portage/tests/resolver/test_depclean_slot_unavailable.py @@ -46,7 +46,7 @@ class DepcleanUnavailableSlotTestCase(TestCase): finally: playground.cleanup() - # Now make the newer version availale and verify that + # Now make the newer version available and verify that # the lower version is depcleaned. ebuilds.update( { diff --git a/lib/portage/tests/unicode/test_string_format.py b/lib/portage/tests/unicode/test_string_format.py index 949b01558e..9878d47fac 100644 --- a/lib/portage/tests/unicode/test_string_format.py +++ b/lib/portage/tests/unicode/test_string_format.py @@ -11,7 +11,7 @@ from _emerge.UseFlagDisplay import UseFlagDisplay class StringFormatTestCase(TestCase): """ - Test that string formatting works correctly in the current interpretter, + Test that string formatting works correctly in the current interpreter, which may be either python2 or python3. """ diff --git a/lib/portage/tests/util/futures/asyncio/test_pipe_closed.py b/lib/portage/tests/util/futures/asyncio/test_pipe_closed.py index 6920f4365f..50d561df61 100644 --- a/lib/portage/tests/util/futures/asyncio/test_pipe_closed.py +++ b/lib/portage/tests/util/futures/asyncio/test_pipe_closed.py @@ -74,7 +74,7 @@ class ReaderPipeClosedTestCase(_PipeClosedTestCase, TestCase): loop.run_until_complete(asyncio.sleep(0, loop=loop)) self.assertFalse(reader_callback.called.done()) - # Demonstrate that the callback is called afer the + # Demonstrate that the callback is called after the # other end of the pipe has been closed. write_end.close() loop.run_until_complete(reader_callback.called) @@ -138,7 +138,7 @@ class WriterPipeClosedTestCase(_PipeClosedTestCase, TestCase): self.assertFalse(writer_callback.called.done()) - # Demonstrate that the callback is called afer the + # Demonstrate that the callback is called after the # other end of the pipe has been closed. read_end.close() loop.run_until_complete(writer_callback.called)