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

Use CentOS Vault for CentOS 7 content #160

Merged
merged 3 commits into from
Jul 15, 2024
Merged

Use CentOS Vault for CentOS 7 content #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52d5dab
Use CentOS Vault for CentOS 7 content
evgeni Jul 15, 2024
59658f2
install mock and unittest2 from RPM, pypi doesn't like our old pip
evgeni Jul 15, 2024
7bd519d
compare call_args as a tuple to work with python2-mock in EPEL7
evgeni Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion images/Dockerfile.el7
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
FROM quay.io/centos/centos:7

RUN sed -i -e 's/^mirrorlist/#mirrorlist/g; /^#baseurl/ s/^#//; /baseurl/ s/mirror/vault/g' /etc/yum.repos.d/CentOS-Base.repo
RUN yum install -y epel-release https://yum.theforeman.org/client/nightly/el7/x86_64/foreman-client-release.rpm && yum clean all
RUN yum install make python-setuptools python-tracer subscription-manager python-pip -y && yum clean all
RUN yum install make python-setuptools python-tracer subscription-manager python-pip python2-mock python-unittest2 -y && yum clean all
WORKDIR /app
5 changes: 3 additions & 2 deletions test/test_katello/test_tracer/test_deb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ def test_needrestart_output(self, m):
output_list = needrestart_output.split("\n")
m.return_value = needrestart_output
self.assertEqual(needrestart(), output_list)
self.assertEqual(m.call_args.args, (["needrestart", "-b"],))
self.assertEqual(m.call_args.kwargs, {"universal_newlines": True})
expected_args = (["needrestart", "-b"],)
expected_kwargs = {"universal_newlines": True}
self.assertEqual(m.call_args, (expected_args, expected_kwargs))
self.assertEqual(len(collect_apps()), 12)

@patch.object(subprocess, "check_output")
Expand Down
Loading