From b00ed2d30680f5de5987f154415cc3a015091c1d Mon Sep 17 00:00:00 2001 From: Justin Lambert Date: Fri, 20 Dec 2013 09:31:56 -0700 Subject: [PATCH 1/3] add puppet 3.4, remove puppet 3.0 testing --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9d96add6c3..784174744b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,21 +10,20 @@ 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" - rvm: 2.0.0 env: PUPPET_VERSION="~> 2.7.0" - - rvm: 2.0.0 - env: PUPPET_VERSION="~> 3.0.0" - rvm: 2.0.0 env: PUPPET_VERSION="~> 3.1.0" gemfile: .gemfile notifications: email: - james@lovedthanlost.net + From c78aa3353e895b57fbf2ab59b6c4705211371817 Mon Sep 17 00:00:00 2001 From: Justin Lambert Date: Fri, 20 Dec 2013 09:52:09 -0700 Subject: [PATCH 2/3] update test for empty array --- spec/defines/sensu_check_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/defines/sensu_check_spec.rb b/spec/defines/sensu_check_spec.rb index f3e38fc37f..ad0b97771f 100644 --- a/spec/defines/sensu_check_spec.rb +++ b/spec/defines/sensu_check_spec.rb @@ -9,9 +9,9 @@ it { should contain_sensu_check('mycheck').with( 'command' => '/etc/sensu/somecommand.rb', - 'handlers' => [], + 'handlers' => '', 'interval' => '60', - 'subscribers' => [] + 'subscribers' => '' ) } end @@ -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') } From 35d6695b033c73771cf2f9e7738afe5f8d5b505b Mon Sep 17 00:00:00 2001 From: Justin Lambert Date: Thu, 26 Dec 2013 13:56:15 -0700 Subject: [PATCH 3/3] add gemfile to exclude profile --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 784174744b..cb914c421d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,10 +18,13 @@ matrix: exclude: - rvm: 1.9.3 env: PUPPET_VERSION="~> 2.7.0" + gemfile: .gemfile - rvm: 2.0.0 env: PUPPET_VERSION="~> 2.7.0" + gemfile: .gemfile - rvm: 2.0.0 env: PUPPET_VERSION="~> 3.1.0" + gemfile: .gemfile gemfile: .gemfile notifications: email: