diff options
| author | Luke Kanies <luke@madstop.com> | 2008-01-08 09:23:34 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-01-08 09:23:34 -0600 |
| commit | 3cc3e0f5b21deee4fbdbcbae18fba47c7a0cbb1e (patch) | |
| tree | 2d47761110c458f175f6483f0424a959cbcb3f34 /test/util | |
| parent | fe9b453650755e66e29eca259075e2e7245a5219 (diff) | |
| download | puppet-3cc3e0f5b21deee4fbdbcbae18fba47c7a0cbb1e.tar.gz puppet-3cc3e0f5b21deee4fbdbcbae18fba47c7a0cbb1e.tar.xz puppet-3cc3e0f5b21deee4fbdbcbae18fba47c7a0cbb1e.zip | |
Lots o' bug-fixes toward getting rid of global resources.
We still have about 60 failing tests, but some of them are
the failing directory service tests (probably 20 or so),
and most are simple fixes to the tests themselves.
Diffstat (limited to 'test/util')
| -rwxr-xr-x | test/util/filetype.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/util/filetype.rb b/test/util/filetype.rb index 6c7ede07b..24a968552 100755 --- a/test/util/filetype.rb +++ b/test/util/filetype.rb @@ -85,7 +85,7 @@ class TestFileType < Test::Unit::TestCase assert_nothing_raised("Could not call backup with no buckets") do obj.backup end - puppet = type["puppet"] + puppet = type.mkdefaultbucket assert(puppet, "Did not create default filebucket") assert_equal("one", puppet.bucket.getfile(Digest::MD5.hexdigest(File.read(path))), "Could not get file from backup") @@ -99,7 +99,7 @@ class TestFileType < Test::Unit::TestCase assert_equal("two", puppet.bucket.getfile(Digest::MD5.hexdigest(File.read(path))), "Could not get file from backup") end - if Facter["operatingsystem"].value == "Darwin" + if Facter["operatingsystem"].value == "Darwin" and Facter["operatingsystemrelease"] != "9.1.0" def test_ninfotoarray obj = nil type = nil |