diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-04-08 14:38:12 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-04-08 14:38:12 -0700 |
| commit | 87f4e0a1ce60ddb443a5eda459793c5acb7fce1e (patch) | |
| tree | 6696b189164ef2114568b1ec3fb472512d3f2cd1 /spec/integration | |
| parent | 89327e9b956fd806418d548b25c458b9ebeac141 (diff) | |
| parent | d43f85063a0e40fdb5d02fb63d82639f2ca278f5 (diff) | |
| download | puppet-87f4e0a1ce60ddb443a5eda459793c5acb7fce1e.tar.gz puppet-87f4e0a1ce60ddb443a5eda459793c5acb7fce1e.tar.xz puppet-87f4e0a1ce60ddb443a5eda459793c5acb7fce1e.zip | |
Merge branch 'ticket/next/maint-fix_tests_for_old_rubies' into next
* ticket/next/maint-fix_tests_for_old_rubies:
maint: Ruby < 1.8.7 knows size but not count
maint: Get tests passing on Ruby < 1.8.7
Diffstat (limited to 'spec/integration')
| -rw-r--r-- | spec/integration/provider/mount_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/integration/provider/mount_spec.rb b/spec/integration/provider/mount_spec.rb index d6f25fe1d..646862050 100644 --- a/spec/integration/provider/mount_spec.rb +++ b/spec/integration/provider/mount_spec.rb @@ -56,7 +56,7 @@ describe "mount provider (integration)" do def check_fstab(expected_to_be_present) # Verify that the fake fstab has the expected data in it - fstab_contents = File.read(@fake_fstab).lines.map(&:chomp).reject { |x| x =~ /^#|^$/ } + fstab_contents = File.read(@fake_fstab).split("\n").reject { |x| x =~ /^#|^$/ } if expected_to_be_present fstab_contents.length().should == 1 device, rest_of_line = fstab_contents[0].split(/\t/,2) |