Skip to content

Commit 1f5acfb

Browse files
authored
Merge pull request #112 from puppetlabs/spec_facter_fix
stubbing processor fact to fix failures on osx
2 parents e9c75ff + 1243e99 commit 1f5acfb

File tree

2 files changed

+21
-0
lines changed

2 files changed

+21
-0
lines changed

spec/fixtures/facts/processors

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"count": 8,
3+
"isa": "i386",
4+
"models": [
5+
"Intel(R) Core(TM) i7-3740QM CPU @ 2.70GHz",
6+
"Intel(R) Core(TM) i7-3740QM CPU @ 2.70GHz",
7+
"Intel(R) Core(TM) i7-3740QM CPU @ 2.70GHz",
8+
"Intel(R) Core(TM) i7-3740QM CPU @ 2.70GHz",
9+
"Intel(R) Core(TM) i7-3740QM CPU @ 2.70GHz",
10+
"Intel(R) Core(TM) i7-3740QM CPU @ 2.70GHz",
11+
"Intel(R) Core(TM) i7-3740QM CPU @ 2.70GHz",
12+
"Intel(R) Core(TM) i7-3740QM CPU @ 2.70GHz"
13+
],
14+
"physicalcount": 4,
15+
"speed": "2.70 GHz"
16+
}

spec/unit/docker_facts_spec.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
Facter::Util::Resolution.stubs(:which).with('docker').returns('/usr/bin/docker')
99
docker_info = File.read(fixtures('facts', 'docker_info'))
1010
Facter::Util::Resolution.stubs(:exec).with("docker info --format '{{json .}}'").returns(docker_info)
11+
processors = File.read(fixtures('facts', 'processors'))
12+
Facter.fact(:processors).stubs(:value).returns(JSON.parse(processors))
1113

1214
docker_network_list = File.read(fixtures('facts', 'docker_network_list'))
1315
Facter::Util::Resolution.stubs(:exec).with('docker network ls | tail -n +2').returns(docker_network_list)
@@ -55,6 +57,8 @@
5557
before do
5658
docker_version = File.read(fixtures('facts', 'docker_version'))
5759
Facter.fact(:docker_version).stubs(:value).returns(JSON.parse(docker_version))
60+
Facter.fact(:interfaces).stubs(:value).returns('br-19a6ebf6f5a5,docker0,eth0,lo')
61+
5862
end
5963
it do
6064
expect(Facter.fact(:docker_client_version).value).to eq(
@@ -67,6 +71,7 @@
6771
before do
6872
docker_version = File.read(fixtures('facts', 'docker_version'))
6973
Facter.fact(:docker_version).stubs(:value).returns(JSON.parse(docker_version))
74+
Facter.fact(:interfaces).stubs(:value).returns('br-19a6ebf6f5a5,docker0,eth0,lo')
7075
end
7176
it do
7277
expect(Facter.fact(:docker_server_version).value).to eq(

0 commit comments

Comments
 (0)