Skip to content

Commit ac9088d

Browse files
committed
[travis] ruby 1.9.3 has been EOL'd for a while, adding 2.2.3 and fixing CI.
[travis] newer rubies got issues with the puppet (official) gems. [travis] fixing spec tests - default for dogstatsd is yes. [travis] pinpoint rubocop to 0.35.x to address ruby 2.2.3 testing issues. [travis] syck required? [travis] excluding incompatible puppet modules with ruby 2.2.3.
1 parent 0e36059 commit ac9088d

3 files changed

Lines changed: 16 additions & 5 deletions

File tree

.travis.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ before_install: rm -f Gemfile.lock
33
sudo: false
44
cache: bundler
55
rvm:
6-
- 1.9.3
76
- 2.0.0
87
- 2.1.0
8+
- 2.2.3
99
script:
1010
- bundle exec rake spec
1111
- bundle exec rake test
@@ -42,3 +42,12 @@ matrix:
4242
env: PUPPET_VERSION="~> 3.3.0"
4343
- rvm: 2.1.0
4444
env: PUPPET_VERSION="~> 3.4.0"
45+
46+
- rvm: 2.2.3
47+
env: PUPPET_VERSION="~> 2.7.0"
48+
- rvm: 2.2.3
49+
env: PUPPET_VERSION="~> 3.2.0"
50+
- rvm: 2.2.3
51+
env: PUPPET_VERSION="~> 3.3.0"
52+
- rvm: 2.2.3
53+
env: PUPPET_VERSION="~> 3.4.0"

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
source "https://rubygems.org"
22

33
group :test do
4+
gem "syck"
5+
gem "listen", "~> 3.0.0"
46
gem "puppet", ENV['PUPPET_VERSION'] || '~> 4.2.0'
57
gem "puppet-lint"
68
gem "puppet-syntax"

spec/classes/datadog_agent_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
'content' => /^# bind_host: localhost\n/,
123123
)}
124124
it { should contain_file('/etc/dd-agent/datadog.conf').with(
125-
'content' => /^use_dogstatsd: no\n/,
125+
'content' => /^use_dogstatsd: yes\n/,
126126
)}
127127
it { should contain_file('/etc/dd-agent/datadog.conf').with(
128128
'content' => /^dogstatsd_port: 8125\n/,
@@ -341,10 +341,10 @@
341341
)}
342342
end
343343

344-
context 'with use_dogstatsd set to yes' do
345-
let(:params) {{:use_dogstatsd => true}}
344+
context 'with use_dogstatsd set to no' do
345+
let(:params) {{:use_dogstatsd => false}}
346346
it { should contain_file('/etc/dd-agent/datadog.conf').with(
347-
'content' => /^use_dogstatsd: yes\n/,
347+
'content' => /^use_dogstatsd: no\n/,
348348
)}
349349
end
350350
context 'with dogstatsd_port set to 8126' do

0 commit comments

Comments
 (0)