diff options
| author | Stig Sandbeck Mathisen <ssm@debian.org> | 2014-09-07 10:14:36 +0200 |
|---|---|---|
| committer | Stig Sandbeck Mathisen <ssm@debian.org> | 2014-09-07 10:14:36 +0200 |
| commit | d4b83be375ac1dead058e091191ee7c7b7c24c8a (patch) | |
| tree | dc825687392ae3068de5b764be60c53122d9e02a /spec/unit/util/zaml_spec.rb | |
| parent | 229cbb976fe0f70f5f30548b83517b415840f9bb (diff) | |
| parent | 1681684857c6e39d60d87b0b3520d8783977ceff (diff) | |
| download | puppet-upstream/3.7.0.tar.gz | |
Imported Upstream version 3.7.0upstream/3.7.0
Diffstat (limited to 'spec/unit/util/zaml_spec.rb')
| -rwxr-xr-x | spec/unit/util/zaml_spec.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/unit/util/zaml_spec.rb b/spec/unit/util/zaml_spec.rb index 56c5cb719..b239b4a84 100755 --- a/spec/unit/util/zaml_spec.rb +++ b/spec/unit/util/zaml_spec.rb @@ -69,7 +69,11 @@ describe "Pure ruby yaml implementation" do end it "serializes a time in UTC" do - pending("not supported on Windows", :if => Puppet.features.microsoft_windows? && RUBY_VERSION[0,3] == '1.8') do + bad_rubies = + RUBY_VERSION[0,3] == '1.8' || + RUBY_VERSION[0,3] == '2.0' && RUBY_PLATFORM == 'i386-mingw32' + + pending("not supported on Windows", :if => Puppet.features.microsoft_windows? && bad_rubies) do the_time_in("Europe/London").should be_equivalent_to(the_time_in_yaml_offset_by("+00:00")) end end |