← Back to branch summary

~bkerensa/ubuntu/raring/puppet/new-upstream-release

« back to all changes in this revision

Viewing changes to spec/integration/provider/mount_spec.rb

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2011-07-25 01:00:37 UTC
  • mfrom: (1.1.24 upstream) (3.1.25 sid)
  • Revision ID: james.westby@ubuntu.com-20110725010037-875vuxs10eboqgw3
Tags: 2.7.1-1ubuntu1
https://launchpad.net/bugs/641001
* Merge from debian unstable.  Remaining changes:
  - debian/puppetmaster-passenger.postinst: Use cacrl instead of hostcrl to
    set the location of the CRL in apache2 configuration. Fix apache2
    configuration on upgrade as well (LP: #641001)
  - move all puppet dependencies to puppet-common since all the code
    actually located in puppet-common.
  - move libagueas from a recommend to a dependency.

Show diffs side-by-side

added added

removed removed

Lines of Context:
spec/integration/provider/mount_spec.rb
1
 
require File.dirname(__FILE__) + '/../../spec_helper'
 
1
require 'spec_helper'
2
2
 
3
3
require 'puppet/file_bucket/dipper'
4
4
 
56
56
 
57
57
  def check_fstab(expected_to_be_present)
58
58
    # Verify that the fake fstab has the expected data in it
59
 
    fstab_contents = File.read(@fake_fstab).lines.map(&:chomp).reject { |x| x =~ /^#|^$/ }
 
59
    fstab_contents = File.read(@fake_fstab).split("\n").reject { |x| x =~ /^#|^$/ }
60
60
    if expected_to_be_present
61
61
      fstab_contents.length().should == 1
62
62
      device, rest_of_line = fstab_contents[0].split(/\t/,2)