summaryrefslogtreecommitdiffstats
path: root/spec/unit/memory_spec.rb
diff options
context:
space:
mode:
authorNick Lewis <nick@puppetlabs.com>2011-05-31 15:37:30 -0700
committerNick Lewis <nick@puppetlabs.com>2011-05-31 15:37:30 -0700
commit97927e321d1e24554ad21b92ef4afb1bd64c0167 (patch)
treedf2f82066114918911670749887812674e4a72e1 /spec/unit/memory_spec.rb
parent59173268a5c6525a4a5df55b362775d07bc6b52d (diff)
parent9404a7a3bb8da660e26897d052cdd03c291fb0bb (diff)
downloadfacter-master.tar.gz
facter-master.tar.xz
facter-master.zip
Merge branch 'ticket/master/7670'HEADmaster
Diffstat (limited to 'spec/unit/memory_spec.rb')
-rw-r--r--spec/unit/memory_spec.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/unit/memory_spec.rb b/spec/unit/memory_spec.rb
index 5cae8cb..fe4ec36 100644
--- a/spec/unit/memory_spec.rb
+++ b/spec/unit/memory_spec.rb
@@ -6,7 +6,9 @@ require 'facter'
describe "Memory facts" do
before do
- Facter.loadfacts
+ # We need these facts loaded, but they belong to a file with a
+ # different name, so load the file explicitly.
+ Facter.collection.loader.load(:memory)
end
after do