diff options
author | Josh Cooper <josh@puppetlabs.com> | 2011-07-27 15:28:21 -0700 |
---|---|---|
committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-08-19 13:52:57 -0700 |
commit | 9fbb0be88daec8def1cca622cd4045d4eda7a3b5 (patch) | |
tree | 544c178c8c87bc2300982a3e0823038c1d635b41 | |
parent | c93015264f8778baf6ba309064ab5a8ab16f32bc (diff) | |
download | puppet-9fbb0be88daec8def1cca622cd4045d4eda7a3b5.tar.gz puppet-9fbb0be88daec8def1cca622cd4045d4eda7a3b5.tar.xz puppet-9fbb0be88daec8def1cca622cd4045d4eda7a3b5.zip |
(#8663) Reenable spec tests on Windows that now pass
The cacher was causing spec tests to fail due to Time.now not having
millisecond resolution on Windows. Now that usage of the cacher has
been removed from many places, these tests now pass.
Reviewed-by: Jacob Helwig <jacob@puppetlabs.com>
(cherry picked from commit 9e502ed121847fe4fcca90453c0520b53103d17d)
-rwxr-xr-x | spec/integration/parser/ruby_manifest_spec.rb | 2 | ||||
-rwxr-xr-x | spec/integration/resource/type_collection_spec.rb | 2 | ||||
-rwxr-xr-x | spec/unit/indirector/file_bucket_file/file_spec.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/spec/integration/parser/ruby_manifest_spec.rb b/spec/integration/parser/ruby_manifest_spec.rb index b04baf5e0..7f3bb71e9 100755 --- a/spec/integration/parser/ruby_manifest_spec.rb +++ b/spec/integration/parser/ruby_manifest_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' require 'tempfile' require 'puppet_spec/files' -describe "Pure ruby manifests", :fails_on_windows => true do +describe "Pure ruby manifests" do include PuppetSpec::Files before do diff --git a/spec/integration/resource/type_collection_spec.rb b/spec/integration/resource/type_collection_spec.rb index 0852a9850..6ea2e7fe7 100755 --- a/spec/integration/resource/type_collection_spec.rb +++ b/spec/integration/resource/type_collection_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' require 'puppet_spec/files' require 'puppet/resource/type_collection' -describe Puppet::Resource::TypeCollection, :fails_on_windows => true do +describe Puppet::Resource::TypeCollection do describe "when autoloading from modules" do include PuppetSpec::Files diff --git a/spec/unit/indirector/file_bucket_file/file_spec.rb b/spec/unit/indirector/file_bucket_file/file_spec.rb index ee0b61af1..eb86eee85 100755 --- a/spec/unit/indirector/file_bucket_file/file_spec.rb +++ b/spec/unit/indirector/file_bucket_file/file_spec.rb @@ -14,7 +14,7 @@ describe Puppet::FileBucketFile::File do Puppet::FileBucketFile::File.doc.should be_instance_of(String) end - describe "non-stubbing tests", :fails_on_windows => true do + describe "non-stubbing tests" do include PuppetSpec::Files before do |