From 679ae5029070b3c714db8a3c345d750b42c8e70a Mon Sep 17 00:00:00 2001 From: James Garner Date: Thu, 5 Dec 2024 12:46:01 +1300 Subject: [PATCH] test: switch from inkscape to terminator ppa for ci --- tests/integration/keys/INKSCAPE_KEY.asc | 29 ----------------------- tests/integration/keys/TERMINATOR_KEY.asc | 28 ++++++++++++++++++++++ tests/integration/test_apt.py | 26 ++++++++++---------- 3 files changed, 41 insertions(+), 42 deletions(-) delete mode 100644 tests/integration/keys/INKSCAPE_KEY.asc create mode 100644 tests/integration/keys/TERMINATOR_KEY.asc diff --git a/tests/integration/keys/INKSCAPE_KEY.asc b/tests/integration/keys/INKSCAPE_KEY.asc deleted file mode 100644 index 0c5637b..0000000 --- a/tests/integration/keys/INKSCAPE_KEY.asc +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQINBGY0ViQBEACsQsdIRXzyEkk38x2oDt1yQ/Kt3dsiDKJFNLbs/xiDHrgIW6cU -1wZB0pfb3lCyG3/ZH5uvR0arCSHJvCvkdCFTqqkZndSA+/pXreCSLeP8CNawf/RM -3cNbdJlE8jXzaX2qzSEC9FDNqu4cQHIHR7xMAbSCPW8rxKvRCWmkZccfndDuQyN2 -vg3b2x9DWKS3DBRffivglF3yT49OuLemG5qJHujKOmNJZ32JoRniIivsuk1CCS1U -NDK6xWkr13aNe056QhVAh2iPF6MRE85zail+mQxt4LAgl/aLR0JSDSpWkbQH7kbu -5cJVan8nYF9HelVJ3QuMwdz3VQn4YVO2Wc8s0YfnNdQttYaUx3lz35Fct6CaOqjP -pgsZ4467lmB9ut74G+wDCQXmT232hsBkTz4D0DyVPB/ziBgGWUKti0AWNT/3kFww -2VM/80XADaDz0Sc/Hzi/cr9ZrbW3drMwoVvKtfMtOT7FMbeuPRWZKYZnDbvNm62e -ToKVudE0ijfsksxbcHKmGdvWntCxlinp0i39Jfz6y54pppjmbHRQgasmqm2EQLfA -RUNW/zB7gX80KTUCGjcLOTPajBIN5ZfjVITetryAFjv7fnK0qpf2OpqwF832W4V/ -S3GZtErupPktYG77Z9jOUxcJeEGYjWbVlbit8mTKDRdQUXOeOO6TzB4RcwARAQAB -tCVMYXVuY2hwYWQgUFBBIGZvciBJbmtzY2FwZSBEZXZlbG9wZXJziQJOBBMBCgA4 -FiEEVr3/0vHJaz0VdeO4XJoLhs0vyzgFAmY0ViQCGwMFCwkIBwIGFQoJCAsCBBYC -AwECHgECF4AACgkQXJoLhs0vyzh3RBAAo7Hee8i2I4n03/iq58lqml/OVJH9ZEle -amk3e0wsiVS0QdT/zB8/AMVDB1obazBfrHKJP9Ck+JKH0uxaGRxYBohTbO3Y3sBO -qRHz5VLcFzuyk7AA53AZkNx8Zbv6D0O4JTCPDJn9Gwbd/PpnvJm9Ri+zEiVPhXNu -oSBryGM09un2Yvi0DA+ulouSKTy9dkbI1R7flPZ2M/mKT8Lk0n1pJu5FvgPC4E6R -PT0Njw9+k/iHtP76U4SqHJZZx2I/TGlXMD1memyTK4adWZeGLaAiFadsoeJsDoDE -MkHFxFkr9n0E4wJhRGgL0OxDWugJemkUvHbzXFNUaeX5Spw/aO7r1CtTh8lyqiom -4ebAkURjESRFOFzcsM7nyQnmt2OgQkEShSL3NrDMkj1+3+FgQtd8sbeVpmpGBq87 -J3iq0YMsUysWq8DJSz4RnBTfeGlJWJkl3XxB9VbG3BqqbN9fRp+ccgZ51g5/DEA/ -q8jYS7Ur5bAlSoeA4M3SvKSlQM8+aT35dteFzejvo1N+2n0E0KoymuRsDBdzby0z -lJDKe244L5D6UPJo9YTmtE4kG/fGNZ5/JdRA+pbe7f/z84HVcJ3ziGdF/Nio/D8k -uFjZP2M/mxC7j+WnmKAruqmY+5vkAEqUPTobsloDjT3B+z0rzWk8FG/G5KFccsBO -2ekz6IVTXVA= -=VF33 ------END PGP PUBLIC KEY BLOCK----- \ No newline at end of file diff --git a/tests/integration/keys/TERMINATOR_KEY.asc b/tests/integration/keys/TERMINATOR_KEY.asc new file mode 100644 index 0000000..9e30ec0 --- /dev/null +++ b/tests/integration/keys/TERMINATOR_KEY.asc @@ -0,0 +1,28 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBF+QbdoBEADVJllCeHgrQoKNH0ThjzarJAf379nA/y1Bxog9BsJCyyny/wlb +BJ9hUWdqTVgLAvrE4Dz4Y+ju0bjI4ukonzG4oTsFzncm20MmbcrmhdMZQXC2ONit +2+cRI05HGlgPlnIsMT0NRFJ3JjL0GSU+koSyU3SWb2Dgevnk2zkoo37xvsvF3DFx +gg1JvGhZyMiPDqnnBcknkdoQHIG/Qe8T0yCIz7Byu5Ej7WzPFznlHhg1ybmU0eze +TJOTo9R+57dD4hthi4329/E+6AuGZSZJBTRe2r1yW3tKpxx88b9RU6l/5fyJM6xi +udneOdcGKE6PNRCmKCAMXc5UGS4H1j5s5QcWdmXKtYG+b5tQcqX2DlCnCdAnmwMh +VlH1s9PI19leRkQnJs64cZkVBBqNhPQrBvvZpBLKXWB6YQBhRDf8FoP/zwdvKEZh +4JwFrRk6fnJ7ZmZFun58rMYnkTy8AX4wvvGPlfo2UgjDlEG9w82udIkTpCAgIOFG +4rQ4mcXvH6D7v7VhrIszKIDrtHTtV03FJntZCyAavbafyfx3OmMgWIZFXOxqk2Jm +hVm93CrZbrp3A7FnxcMa7mCuOw9j7kYe4ZmMj9eY3JiM+lrGB+WhA9mhmQc8kWWU +5wJphnmZ2SqEu/FD7B2UNQHHswRcTbGFBIjsgFE2FNFE6WFF7sB+uKeFLQARAQAB +tBpMYXVuY2hwYWQgUFBBIGZvciBNYXR0Um9zZYkCTgQTAQoAOBYhBGTdJhyFmKa6 +4qIL070v4KAeMWTbBQJfkG3aAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJ +EL0v4KAeMWTbrrMQAM5oNOWNSFmkCysxmd/geBT8B9koClVLWyiKeWdVtGvFjajq ++AUQ9xJpbQSf7wL1VkcqmL3HKAY6xwfT5qJCjvpljJVNMxpg12EMHBEzzFq5XnL7 +5l0ovf+LigexN0zU46Uc8vasDFDkRrR6Vftl4wq3DXKo70SPXX+rACN4R7Tt/jRE +D+XWKT2zJ1KZIt/8j064d9d2r6n6ozdMiO/WyR/oNQjqZHkqSxH7jOEfPp6u8PM6 +HnsyCBIWfliS5ieQ1hT3bp2Zl0qHSrvND4j+TnrmgU5LYhWhzvafEKyPoEkjWiIr +3zXRtqc40yVlYdMtu4LEesYxLUKt0Kx9yoAoe/UtT4feCFdXb/9S8CEqSfSDo8Hb +XVjKHjX0HL9os7xFX0f4Jeah7QHF0NiYPMqClDCe+/A49wvWz6JMaGhHy7qoa/hg +k8mmpSmWw24juMP6j3mMD0W8NfEOc0gXmFczJjGcm7WwYD6w3y1G8EOafM6CvzW6 +3M/sMt/NSKtXlXtflb1JJCcY6rLhXihjjE5HGZGvzTsNLWZi5kaIXOk/qBKf4gLJ +MjSgVI4iBvlsmQkQvGwuSJIkrXeNvzQIOyfllmA4L+i/8gGYJslxNtd19Ij/TMFs +glQXml9hi28VCApMCL64eF3sED9731RH7dYlW6xVFeNqL4Dg002y4ZTpXBPb +=3yD+ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/tests/integration/test_apt.py b/tests/integration/test_apt.py index ec753d6..5fd67b4 100644 --- a/tests/integration/test_apt.py +++ b/tests/integration/test_apt.py @@ -91,37 +91,37 @@ def test_install_package_from_external_repository(): def test_install_higher_version_package_from_external_repository(): - repo_id = "deb-https://ppa.launchpadcontent.net/inkscape.dev/stable/ubuntu/-jammy" + repo_id = "deb-https://ppa.launchpadcontent.net/mattrose/terminator/ubuntu/-jammy" repos = apt.RepositoryMapping() assert repo_id not in repos ## version before - if not get_command_path("inkscape"): - apt.add_package("inkscape") + if not get_command_path("terminator"): + apt.add_package("terminator") version_before = subprocess.run( - ["inkscape", "--version"], + ["terminator", "--version"], capture_output=True, check=True, text=True, ).stdout - apt.remove_package("inkscape") - assert not get_command_path("inkscape") + apt.remove_package("terminator") + assert not get_command_path("terminator") ## steps repo = apt.DebianRepository( enabled=True, repotype="deb", - uri="https://ppa.launchpadcontent.net/inkscape.dev/stable/ubuntu/", + uri="https://ppa.launchpadcontent.net/mattrose/terminator/ubuntu/", release="jammy", groups=["main"], ) repos.add(repo) # update_cache=False by default assert repo_id in repos assert repo_id in apt.RepositoryMapping() - key_file = apt.import_key((KEY_DIR / "INKSCAPE_KEY.asc").read_text()) + key_file = apt.import_key((KEY_DIR / "TERMINATOR_KEY.asc").read_text()) apt.update() - apt.add_package("inkscape") - assert get_command_path("inkscape") + apt.add_package("terminator") + assert get_command_path("terminator") version_after = subprocess.run( - ["inkscape", "--version"], + ["terminator", "--version"], capture_output=True, check=True, text=True, @@ -132,8 +132,8 @@ def test_install_higher_version_package_from_external_repository(): apt._add_repository(repo, remove=True) # pyright: ignore[reportPrivateUsage] assert repo_id not in apt.RepositoryMapping() apt.update() - apt.remove_package("inkscape") - assert not get_command_path("inkscape") + apt.remove_package("terminator") + assert not get_command_path("terminator") def test_install_hardware_observer_ssacli():