Merge pull request #315 from mbmilligan/mbmilligan-fix-tests

Tweaks to get travis ci tests working again
voxpupuli · Jul 15, 2016 · c6ac464 · c6ac464
2 parents 333de56 + 315efa0
commit c6ac464
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -17,6 +17,10 @@ else
   gem 'rake', :require => false
 end
 
+if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '2.0'
+  gem 'json', '~> 1.0'
+end
+
 if facterversion = ENV['FACTER_GEM_VERSION']
   gem 'facter', facterversion, :require => false
 else

diff --git a/Rakefile b/Rakefile
@@ -12,6 +12,7 @@ end
 PuppetLint.configuration.fail_on_warnings
 PuppetLint.configuration.send('relative')
 PuppetLint.configuration.send('disable_80chars')
+PuppetLint.configuration.send('disable_140chars')
 PuppetLint.configuration.send('disable_class_inherits_from_params_class')
 PuppetLint.configuration.send('disable_class_parameter_defaults')
 PuppetLint.configuration.send('disable_documentation')
@@ -36,4 +37,4 @@ task :test => [
   :syntax,
   :lint,
   :spec,
-]
+]
diff --git a/manifests/pip.pp b/manifests/pip.pp
@@ -85,15 +85,15 @@
 
   $python_provider = getparam(Class['python'], 'provider')
   $python_version  = getparam(Class['python'], 'version')
-  
+
   # Get SCL exec prefix
   # NB: this will not work if you are running puppet from scl enabled shell
   $exec_prefix = $python_provider ? {
     'scl'   => "scl enable ${python_version} -- ",
     'rhscl' => "scl enable ${python_version} -- ",
     default => '',
   }
-  
+
   # Parameter validation
   if ! $virtualenv {
     fail('python::pip: virtualenv parameter must not be empty')