yum module properly check for None config_file (#46641)
* yum module properly check for None config_file * add conf_file test cases to yum integration tests Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
parent
9764f32513
commit
fb6e91bf98
2 changed files with 20 additions and 2 deletions
|
@ -1306,8 +1306,8 @@ class YumModule(YumDnf):
|
||||||
if self.conf_file and os.path.exists(self.conf_file):
|
if self.conf_file and os.path.exists(self.conf_file):
|
||||||
self.yum_basecmd += ['-c', self.conf_file]
|
self.yum_basecmd += ['-c', self.conf_file]
|
||||||
|
|
||||||
if repoq:
|
if repoq:
|
||||||
repoq += ['-c', self.conf_file]
|
repoq += ['-c', self.conf_file]
|
||||||
|
|
||||||
if self.skip_broken:
|
if self.skip_broken:
|
||||||
self.yum_basecmd.extend(['--skip-broken'])
|
self.yum_basecmd.extend(['--skip-broken'])
|
||||||
|
|
|
@ -120,6 +120,15 @@
|
||||||
that:
|
that:
|
||||||
- "yum_result is successful"
|
- "yum_result is successful"
|
||||||
|
|
||||||
|
- name: install sos with state latest in check mode with config file param
|
||||||
|
yum: name=sos state=latest conf_file=/etc/yum.conf
|
||||||
|
check_mode: true
|
||||||
|
register: yum_result
|
||||||
|
- name: verify install sos with state latest in check mode with config file param
|
||||||
|
assert:
|
||||||
|
that:
|
||||||
|
- "yum_result is changed"
|
||||||
|
|
||||||
- name: install sos with state latest in check mode
|
- name: install sos with state latest in check mode
|
||||||
yum: name=sos state=latest
|
yum: name=sos state=latest
|
||||||
check_mode: true
|
check_mode: true
|
||||||
|
@ -145,6 +154,15 @@
|
||||||
that:
|
that:
|
||||||
- "not yum_result is changed"
|
- "not yum_result is changed"
|
||||||
|
|
||||||
|
- name: install sos with state latest idempotence with config file param
|
||||||
|
yum: name=sos state=latest
|
||||||
|
register: yum_result
|
||||||
|
- name: verify install sos with state latest idempotence with config file param
|
||||||
|
assert:
|
||||||
|
that:
|
||||||
|
- "not yum_result is changed"
|
||||||
|
|
||||||
|
|
||||||
# Multiple packages
|
# Multiple packages
|
||||||
- name: uninstall sos and bc
|
- name: uninstall sos and bc
|
||||||
yum: name=sos,bc state=removed
|
yum: name=sos,bc state=removed
|
||||||
|
|
Loading…
Reference in a new issue