Update Puppet, Ruby versions and fix errors

Fixes https://github.com/dfarrell07/puppet-opendaylight/issues/119

Change-Id: I2266b7b78c544f9c76ea4d67bece003ad6b7820d
Signed-off-by: srisankethu <sanketh.uppalapati@research.iiit.ac.in>
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>

diff --git a/.travis.yml b/.travis.yml
index b0e8d55b0280c9bd096739a65888e10bcd2aea26..68b65fda600d1d43416b5bcfcb24142750349cac 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,29 +3,24 @@ language: ruby
 bundler_args: --without local_only
 before_install: rm Gemfile.lock || true
 rvm:
-  - 2.0.0
   - 2.1.7
   - 2.2.3
+  - 2.2.6
+  - 2.3.1
 script: bundle exec rake test
 env:
-  - PUPPET_VERSION="~> 3.4.0"
-  - PUPPET_VERSION="~> 3.5.0"
-  - PUPPET_VERSION="~> 3.6.0"
-  - PUPPET_VERSION="~> 3.7.0"
-  - PUPPET_VERSION="~> 4.0.0"
-  - PUPPET_VERSION="~> 4.1.0"
-  - PUPPET_VERSION="~> 4.2.0"
+  - PUPPET_VERSION="~> 3.8.0"
   - PUPPET_VERSION="~> 4.3.0"
+  - PUPPET_VERSION="~> 4.5.0"
+  - PUPPET_VERSION="~> 4.8.0"
 matrix:
   exclude:
-    - rvm: 2.2.3
-      env: PUPPET_VERSION="~> 3.4.0"
-    - rvm: 2.2.3
-      env: PUPPET_VERSION="~> 3.5.0"
-    - rvm: 2.2.3
-      env: PUPPET_VERSION="~> 3.6.0"
-    - rvm: 2.2.3
-      env: PUPPET_VERSION="~> 3.7.0"
+  - rvm: 2.2.3
+    env: PUPPET_VERSION="~> 3.8.0"
+  - rvm: 2.2.6
+    env: PUPPET_VERSION="~> 3.8.0"
+  - rvm: 2.3.1
+    env: PUPPET_VERSION="~> 3.8.0"
 notifications:
   email:
     recipients:

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 51260a3b05a32b94011d29178df665fe0e229bd4..2452841f773c8fd500700912d0791a6a6894fae2 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -49,12 +49,12 @@ def generic_tests()
   it { should contain_class('opendaylight::service') }
 
   # Confirm relationships between classes
-  it { should contain_class('opendaylight::install').that_comes_before('opendaylight::config') }
-  it { should contain_class('opendaylight::config').that_requires('opendaylight::install') }
-  it { should contain_class('opendaylight::config').that_notifies('opendaylight::service') }
-  it { should contain_class('opendaylight::service').that_subscribes_to('opendaylight::config') }
-  it { should contain_class('opendaylight::service').that_comes_before('opendaylight') }
-  it { should contain_class('opendaylight').that_requires('opendaylight::service') }
+  it { should contain_class('opendaylight::install').that_comes_before('Class[opendaylight::config]') }
+  it { should contain_class('opendaylight::config').that_requires('Class[opendaylight::install]') }
+  it { should contain_class('opendaylight::config').that_notifies('Class[opendaylight::service]') }
+  it { should contain_class('opendaylight::service').that_subscribes_to('Class[opendaylight::config]') }
+  it { should contain_class('opendaylight::service').that_comes_before('Class[opendaylight]') }
+  it { should contain_class('opendaylight').that_requires('Class[opendaylight::service]') }
 
   # Confirm presence of generic resources
   it { should contain_service('opendaylight') }