summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphaël Pinson <raphael.pinson@camptocamp.com>2014-12-18 09:52:19 +0100
committerRaphaël Pinson <raphael.pinson@camptocamp.com>2014-12-18 09:52:19 +0100
commit4ee3ccd822c6f2c673ca2f5ff08b9970ddccbb45 (patch)
tree838eea51ce9e29268a541bde1997f44bb1929995
parent735970f5687f25dd0437133c1408cd30ea6eef4c (diff)
Exclude vendor directories from tests
-rw-r--r--.travis.yml2
-rw-r--r--Gemfile2
-rw-r--r--Rakefile4
3 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 7d246af..db911af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
---
language: ruby
+sudo: false
+cache: bundler
bundler_args: --without system_tests
script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec fakeroot rake spec SPEC_OPTS='--format documentation'", "bundle exec rake metadata"]
matrix:
diff --git a/Gemfile b/Gemfile
index f9c2b63..b83f8b6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ group :development, :unit_tests do
gem 'rake', :require => false
gem 'rspec-puppet', :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git'
gem 'puppetlabs_spec_helper', :require => false
- gem 'puppet-lint', :require => false
+ gem 'puppet-lint', '< 1.1.0', :require => false
gem 'simplecov', :require => false
gem 'rspec-puppet-facts', :require => false
gem 'json', :require => false
diff --git a/Rakefile b/Rakefile
index 5cf3aa8..a81b2c6 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,7 +4,9 @@ require 'puppet-lint/tasks/puppet-lint'
PuppetLint.configuration.fail_on_warnings
PuppetLint.configuration.send('relative')
PuppetLint.configuration.send('disable_80chars')
-PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
+PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp", "vendor/**/*.pp"]
+
+PuppetSyntax.exclude_paths = ["spec/fixtures/**/*.pp", "vendor/**/*"]
desc "Lint metadata.json file"
task :metadata do