Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

repos: fix returned strings for install_stage_packages() #3047

Merged
merged 1 commit into from
Apr 17, 2020
Merged

repos: fix returned strings for install_stage_packages() #3047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion snapcraft/internal/repo/_deb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ def install_stage_packages(
cls.normalize(install_dir)

return [
f"{pkg_name}={pkg_version}"
f"{pkg_name}={pkg_version.version}"
for pkg_name, pkg_version in marked_packages.items()
]

Expand Down
44 changes: 29 additions & 15 deletions tests/unit/repo/test_deb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,25 +100,33 @@ def add_fake_package(
self.dependencies.get(name) for name in dependency_names
]

version = MagicMock(
apt_version = MagicMock(
wraps=FakeAptVersion(
version=version,
priority=priority,
package=package,
dependencies=package_dependencies,
)
)
self.versions[name] = version

type(apt_version).version = PropertyMock(return_value=version)
type(apt_version).priority = PropertyMock(return_value=priority)
type(apt_version).package = PropertyMock(return_value=package)
type(apt_version).dependencies = PropertyMock(return_value=package_dependencies)

self.versions[name] = apt_version

# Wire up coupled package properties.
package.candidate = version
type(package).candidate = PropertyMock(return_value=apt_version)
if installed:
package.installed = version
type(package).installed = PropertyMock(return_value=apt_version)
else:
package.installed = None
type(package).installed = PropertyMock(return_value=None)

# Create matching dependency, even if unused.
dependency = MagicMock(wraps=FakeAptDependency(target_versions=[version]))
dependency = MagicMock(wraps=FakeAptDependency(target_versions=[apt_version]))
type(dependency).target_versions = PropertyMock(return_value=[apt_version])

self.dependencies[name] = dependency

return package
Expand Down Expand Up @@ -158,25 +166,29 @@ def setUp(self):
repo.Ubuntu._cache = None

def test_install_stage_package(self):
repo.Ubuntu.install_stage_packages(
installed_packages = repo.Ubuntu.install_stage_packages(
package_names=["fake-package"], install_dir=self.path
)

self.assertThat(
self.fake_apt_cache["fake-package"].mock_calls,
Contains(call.candidate.fetch_binary(self.path)),
self.fake_apt_cache["fake-package"].candidate.mock_calls,
Contains(call.fetch_binary(self.path)),
)

self.assertThat(installed_packages, Equals(["fake-package=1.0"]))

def test_install_virtual_stage_package(self):
repo.Ubuntu.install_stage_packages(
installed_packages = repo.Ubuntu.install_stage_packages(
package_names=["virtual-fake-package"], install_dir=self.path
)

self.assertThat(
self.fake_apt_cache["fake-package"].mock_calls,
Contains(call.candidate.fetch_binary(self.path)),
self.fake_apt_cache["fake-package"].candidate.mock_calls,
Contains(call.fetch_binary(self.path)),
)

self.assertThat(installed_packages, Equals(["fake-package=1.0"]))

def test_get_package_fetch_error(self):
self.fake_apt_cache.packages[
"fake-package"
Expand All @@ -195,15 +207,17 @@ def test_get_multiarch_package(self):
name="fake-package:arch", dependency_names=[]
)

repo.Ubuntu.install_stage_packages(
installed_packages = repo.Ubuntu.install_stage_packages(
package_names=["fake-package:arch"], install_dir=self.path
)

self.assertThat(
self.fake_apt_cache.packages["fake-package:arch"].mock_calls,
Contains(call.candidate.fetch_binary(self.path)),
self.fake_apt_cache.packages["fake-package:arch"].candidate.mock_calls,
Contains(call.fetch_binary(self.path)),
)

self.assertThat(installed_packages, Equals(["fake-package:arch=1.0"]))

@mock.patch(
"snapcraft.internal.os_release.OsRelease.version_codename", return_value="testy"
)
Expand Down