Skip to content

Commit

Permalink
Merge pull request #117 from jlambert121/puppet_34
Browse files Browse the repository at this point in the history
add puppet 3.4, remove puppet 3.0 testing
  • Loading branch information
jamtur01 committed Dec 26, 2013
2 parents f765af7 + 35d6695 commit 3cf0363
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,23 @@ script:
- "rake spec SPEC_OPTS='--format documentation'"
env:
- PUPPET_VERSION="~> 2.7.0"
- PUPPET_VERSION="~> 3.0.0"
- PUPPET_VERSION="~> 3.1.0"
- PUPPET_VERSION="~> 3.2.0"
- PUPPET_VERSION="~> 3.3.0"
- PUPPET_VERSION="~> 3.4.0"
matrix:
exclude:
- rvm: 1.9.3
env: PUPPET_VERSION="~> 2.7.0"
gemfile: .gemfile
- rvm: 2.0.0
env: PUPPET_VERSION="~> 2.7.0"
- rvm: 2.0.0
env: PUPPET_VERSION="~> 3.0.0"
gemfile: .gemfile
- rvm: 2.0.0
env: PUPPET_VERSION="~> 3.1.0"
gemfile: .gemfile
gemfile: .gemfile
notifications:
email:
- [email protected]

8 changes: 4 additions & 4 deletions spec/defines/sensu_check_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

it { should contain_sensu_check('mycheck').with(
'command' => '/etc/sensu/somecommand.rb',
'handlers' => [],
'handlers' => '',
'interval' => '60',
'subscribers' => []
'subscribers' => ''
) }

end
Expand Down Expand Up @@ -56,9 +56,9 @@

it { should contain_sensu_check('mycheck_foobar').with(
'command' => '/etc/sensu/somecommand.rb',
'handlers' => [],
'handlers' => '',
'interval' => '60',
'subscribers' => []
'subscribers' => ''
) }

it { should contain_file('/etc/sensu/conf.d/checks/mycheck_foobar.json') }
Expand Down

0 comments on commit 3cf0363

Please sign in to comment.