diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_local_apt.py | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/tests/test_local_apt.py b/tests/test_local_apt.py index 1ff52cc..6ba2a06 100644 --- a/tests/test_local_apt.py +++ b/tests/test_local_apt.py @@ -128,10 +128,10 @@ Suggested packages: The following NEW packages will be installed: fonts-mathjax libjs-mathjax 0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. -Inst fonts-mathjax (2.7.9+dfsg-1 Devuan:4.0/stable, Devuan:1.0.0/unstable [all]) -Inst libjs-mathjax (2.7.9+dfsg-1 Devuan:4.0/stable, Devuan:1.0.0/unstable [all]) -Conf fonts-mathjax (2.7.9+dfsg-1 Devuan:4.0/stable, Devuan:1.0.0/unstable [all]) -Conf libjs-mathjax (2.7.9+dfsg-1 Devuan:4.0/stable, Devuan:1.0.0/unstable [all]) +Inst fonts-mathjax (0:2.7.9+dfsg-1 Devuan:4.0/stable, Devuan:1.0.0/unstable [all]) +Inst libjs-mathjax (0:2.7.9+dfsg-1 Devuan:4.0/stable, Devuan:1.0.0/unstable [all]) +Conf fonts-mathjax (0:2.7.9+dfsg-1 Devuan:4.0/stable, Devuan:1.0.0/unstable [all]) +Conf libjs-mathjax (0:2.7.9+dfsg-1 Devuan:4.0/stable, Devuan:1.0.0/unstable [all]) ''' def run_apt_get_install(command, returncode=0, **kwargs): @@ -153,17 +153,24 @@ def run_apt_get_download(command, returncode=0, **kwargs): Instead of running an 'apt-get download' command just write some dummy .deb to the appropriate directory. """ - expected = ['apt-get', '-c', '<conf_path>', 'download', 'libjs-mathjax'] - if 'fonts-mathjax' in command: - expected.insert(-1, 'fonts-mathjax') + expected = ['apt-get', '-c', '<conf_path>', 'download'] + if 'libjs-mathjax' in command: + expected.append('libjs-mathjax') + else: + expected.append('fonts-mathjax=0:2.7.9+dfsg-1') + expected.append('libjs-mathjax=0:2.7.9+dfsg-1') conf_path = Path(process_run_args(command, kwargs, expected)['conf_path']) destination = Path(kwargs.get('cwd') or Path.cwd()) + package_name_regex = re.compile(r'^[^=]+-mathjax') + for word in expected: - if word.endswith('-mathjax'): - deb_path = destination / f'{word}_2.7.9+dfsg-1_all.deb' + match = package_name_regex.match(word) + if match: + filename = f'{match.group(0)}_0%3a2.7.9+dfsg-1_all.deb' + deb_path = destination / filename deb_path.write_text(f'dummy {deb_path.name}') return MockedCompletedProcess(command, returncode, @@ -175,12 +182,12 @@ def run_apt_get_source(command, returncode=0, **kwargs): "tarballs" to the appropriate directory. """ expected = ['apt-get', '-c', '<conf_path>', 'source', - '--download-only', 'libjs-mathjax=2.7.9+dfsg-1'] - if 'fonts-mathjax=2.7.9+dfsg-1' in command: - if command[-1] == 'fonts-mathjax=2.7.9+dfsg-1': - expected.append('fonts-mathjax=2.7.9+dfsg-1') + '--download-only', 'libjs-mathjax=0:2.7.9+dfsg-1'] + if 'fonts-mathjax=0:2.7.9+dfsg-1' in command: + if command[-1] == 'fonts-mathjax=0:2.7.9+dfsg-1': + expected.append('fonts-mathjax=0:2.7.9+dfsg-1') else: - expected.insert(-1, 'fonts-mathjax=2.7.9+dfsg-1') + expected.insert(-1, 'fonts-mathjax=0:2.7.9+dfsg-1') destination = Path(kwargs.get('cwd') or Path.cwd()) for filename in [ @@ -335,8 +342,8 @@ def test_local_apt_download(mock_cache_dir): local_apt.download_apt_packages(sources_list, local_apt.default_keys, ['libjs-mathjax'], destination) - libjs_mathjax_path = destination / 'libjs-mathjax_2.7.9+dfsg-1_all.deb' - fonts_mathjax_path = destination / 'fonts-mathjax_2.7.9+dfsg-1_all.deb' + libjs_mathjax_path = destination / 'libjs-mathjax_0%3a2.7.9+dfsg-1_all.deb' + fonts_mathjax_path = destination / 'fonts-mathjax_0%3a2.7.9+dfsg-1_all.deb' source_paths = [ destination / 'mathjax_2.7.9+dfsg-1.debian.tar.xz', |