summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2005-04-19 20:42:57 +0000
committerLuke Kanies <luke@madstop.com>2005-04-19 20:42:57 +0000
commitc01bc8108b913e62090096e3ef43c699ddc7af6a (patch)
tree9bfe69af09a2d1763d63e739a7cf2436cca65402
parent57194ebf9cd8b607e6eeed0671d9aa0065e3f0bd (diff)
downloadpuppet-c01bc8108b913e62090096e3ef43c699ddc7af6a.tar.gz
puppet-c01bc8108b913e62090096e3ef43c699ddc7af6a.tar.xz
puppet-c01bc8108b913e62090096e3ef43c699ddc7af6a.zip
using the example syslog.conf instead of the one in /etc
git-svn-id: https://reductivelabs.com/svn/puppet/library/trunk@198 980ebf18-57e1-0310-9a29-db15c13687c0
-rw-r--r--test/types/tc_filetype.rb9
1 files changed, 3 insertions, 6 deletions
diff --git a/test/types/tc_filetype.rb b/test/types/tc_filetype.rb
index 64e62c749..255844b40 100644
--- a/test/types/tc_filetype.rb
+++ b/test/types/tc_filetype.rb
@@ -136,8 +136,9 @@ class TestFileType < Test::Unit::TestCase
def test_syslog_nochange
file = nil
type = nil
+ syslog = File.join($blinkbase, "examples/root/etc/debian-syslog.conf")
assert_nothing_raised() {
- file = @syslogtype.new("/etc/syslog.conf")
+ file = @syslogtype.new(syslog)
}
assert_nothing_raised() {
file.retrieve
@@ -146,15 +147,11 @@ class TestFileType < Test::Unit::TestCase
assert(file.insync?)
contents = ""
- ::File.open("/etc/syslog.conf") { |ofile|
+ ::File.open(syslog) { |ofile|
ofile.each { |line|
contents += line
}
}
-
- file.each { |record|
- puts "%s [%s]" % [record.class,record]
- }
#assert_equal(
# contents,
# file.to_s