Skip to content

Commit 2c7d7c2

Browse files
author
carabasdaniel
authored
Merge pull request #589 from Filipovici-Andrei/master
(maint) Fix missing stubs in docker_spec.rb
2 parents 144c484 + 8fbb0b5 commit 2c7d7c2

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

lib/facter/docker.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def interfaces
7474
Facter.add(:docker_version) do
7575
setcode do
7676
if Facter::Util::Resolution.which('docker')
77-
value = Facter::Core::Execution.execute(
77+
value = Facter::Util::Resolution.exec(
7878
"#{docker_command} version --format '{{json .}}'",
7979
)
8080
val = JSON.parse(value)

spec/unit/lib/facter/docker_spec.rb

+5-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
Facter::Util::Resolution.stubs(:exec).with("#{docker_command} info --format '{{json .}}'").returns(docker_info)
1616
processors = File.read(fixtures('facts', 'processors'))
1717
Facter.fact(:processors).stubs(:value).returns(JSON.parse(processors))
18-
18+
docker_version = File.read(fixtures('facts', 'docker_version'))
19+
Facter::Util::Resolution.stubs(:exec).with("#{docker_command} version --format '{{json .}}'").returns(docker_version)
1920
docker_network_list = File.read(fixtures('facts', 'docker_network_list'))
2021
Facter::Util::Resolution.stubs(:exec).with("#{docker_command} network ls | tail -n +2").returns(docker_network_list)
2122
docker_network_names = []
@@ -84,6 +85,9 @@
8485
end
8586

8687
describe 'docker info' do
88+
before :each do
89+
Facter.fact(:interfaces).stubs(:value).returns('br-19a6ebf6f5a5,docker0,eth0,lo')
90+
end
8791
it 'has valid entries' do
8892
expect(Facter.fact(:docker).value).to include(
8993
'Architecture' => 'x86_64',

0 commit comments

Comments
 (0)