diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-04-15 16:12:57 -0700 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-04-15 16:12:57 -0700 |
| commit | 2e2ef4a8923f0bd89d52199107bf1214f3f4d3f5 (patch) | |
| tree | 0eea16efbb488c016d0659646e2dc61395c0ec7a | |
| parent | cedbd5a1bd24f548f888ef8e45afd352c234be56 (diff) | |
| parent | d85c2a8ed1423f11b2c91e084765a81aebfeb2fc (diff) | |
| download | puppet-2e2ef4a8923f0bd89d52199107bf1214f3f4d3f5.tar.gz puppet-2e2ef4a8923f0bd89d52199107bf1214f3f4d3f5.tar.xz puppet-2e2ef4a8923f0bd89d52199107bf1214f3f4d3f5.zip | |
Merge branch 'maint/2.7.x/fix-spec' into 2.7.x
| -rwxr-xr-x | spec/unit/node/facts_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/unit/node/facts_spec.rb b/spec/unit/node/facts_spec.rb index ab462b394..1b6991ca0 100755 --- a/spec/unit/node/facts_spec.rb +++ b/spec/unit/node/facts_spec.rb @@ -126,7 +126,7 @@ describe Puppet::Node::Facts, "when indirecting" do Time.stubs(:now).returns(@timestamp) facts = Puppet::Node::Facts.new("foo", {'a' => 1, 'b' => 2, 'c' => 3}) facts.expiration = @expiration - facts.to_pson.should == %Q[{"data":{"name":"foo","timestamp":"#{@timestamp}","expiration":"Thu Oct 28 11:21:31 -0700 2010","values":{"a":1,"b":2,"c":3}},"document_type":"Puppet::Node::Facts"}] + facts.to_pson.should == %Q[{"data":{"name":"foo","timestamp":"#{@timestamp}","expiration":"#{@expiration}","values":{"a":1,"b":2,"c":3}},"document_type":"Puppet::Node::Facts"}] end it "should not include nil values" do |