summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2008-11-19 18:55:57 +1100
committerJames Turnbull <james@lovedthanlost.net>2008-11-19 18:55:57 +1100
commitc96d250f71bbc75e0ababaeff3b7024bdb20ff60 (patch)
tree6cbd4e8bedf95e352c2be51e2d2ab6fc766fa271
parent8523a483155eccc543dd7d17ea8c4f942dcc249f (diff)
downloadpuppet-c96d250f71bbc75e0ababaeff3b7024bdb20ff60.tar.gz
puppet-c96d250f71bbc75e0ababaeff3b7024bdb20ff60.tar.xz
puppet-c96d250f71bbc75e0ababaeff3b7024bdb20ff60.zip
Fixed #1711 - fileserver test fails due to incorrect mocking
-rw-r--r--CHANGELOG2
-rwxr-xr-xtest/network/handler/fileserver.rb5
2 files changed, 7 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7f2d64512..4d50a6c86 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
0.24.x
+ Fixed #1711 - fileserver test fails due to incorrect mocking
+
Fixed #1751 - Mac OS X DirectoryService nameservice provider support for
plist output and password hash fil
diff --git a/test/network/handler/fileserver.rb b/test/network/handler/fileserver.rb
index 873657e5d..b399bce26 100755
--- a/test/network/handler/fileserver.rb
+++ b/test/network/handler/fileserver.rb
@@ -980,6 +980,11 @@ allow *
}
dir = tempfile()
+
+ # When mocks attack, part 2
+ kernel_fact = Facter.value(:kernel)
+ Facter.stubs(:value).with(:kernel).returns(kernel_fact)
+
Facter.stubs(:value).with(:ipaddress).returns("127.0.0.1")
Facter.stubs(:value).with { |v| v.to_s == "hostname" }.returns("myhost")
Facter.stubs(:value).with { |v| v.to_s == "domain" }.returns("mydomain.com")