From 8fbb0b578d321a19b36b7f0f636fd2bd0b5ec346 Mon Sep 17 00:00:00 2001 From: Florin Dragos Date: Wed, 18 Mar 2020 11:45:29 +0200 Subject: [PATCH] Fix missing stubs in docker_spec.rb --- lib/facter/docker.rb | 2 +- spec/unit/lib/facter/docker_spec.rb | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/facter/docker.rb b/lib/facter/docker.rb index bdbe15ca5e..cfa57935f4 100644 --- a/lib/facter/docker.rb +++ b/lib/facter/docker.rb @@ -74,7 +74,7 @@ def interfaces Facter.add(:docker_version) do setcode do if Facter::Util::Resolution.which('docker') - value = Facter::Core::Execution.execute( + value = Facter::Util::Resolution.exec( "#{docker_command} version --format '{{json .}}'", ) val = JSON.parse(value) diff --git a/spec/unit/lib/facter/docker_spec.rb b/spec/unit/lib/facter/docker_spec.rb index d16ea17e77..22dd4da4bd 100644 --- a/spec/unit/lib/facter/docker_spec.rb +++ b/spec/unit/lib/facter/docker_spec.rb @@ -15,7 +15,8 @@ Facter::Util::Resolution.stubs(:exec).with("#{docker_command} info --format '{{json .}}'").returns(docker_info) processors = File.read(fixtures('facts', 'processors')) Facter.fact(:processors).stubs(:value).returns(JSON.parse(processors)) - + docker_version = File.read(fixtures('facts', 'docker_version')) + Facter::Util::Resolution.stubs(:exec).with("#{docker_command} version --format '{{json .}}'").returns(docker_version) docker_network_list = File.read(fixtures('facts', 'docker_network_list')) Facter::Util::Resolution.stubs(:exec).with("#{docker_command} network ls | tail -n +2").returns(docker_network_list) docker_network_names = [] @@ -84,6 +85,9 @@ end describe 'docker info' do + before :each do + Facter.fact(:interfaces).stubs(:value).returns('br-19a6ebf6f5a5,docker0,eth0,lo') + end it 'has valid entries' do expect(Facter.fact(:docker).value).to include( 'Architecture' => 'x86_64',