summaryrefslogtreecommitdiff
path: root/spec/spec_helper.rb
diff options
context:
space:
mode:
authorTyler Ball <tyler-ball@users.noreply.github.com>2015-03-11 13:40:24 -0700
committerTyler Ball <tyler-ball@users.noreply.github.com>2015-03-11 13:40:24 -0700
commitf400002d1a68b8ee672dea92ddfc6ff15624d9d2 (patch)
tree78a10ce2ba681dc265614201cfb3797fb33652a0 /spec/spec_helper.rb
parentd152df315510d004532ef93b03d53f648c054a81 (diff)
parent3dfddeec7c896668abd6e344f4c70fbf770dadc2 (diff)
downloadchef-f400002d1a68b8ee672dea92ddfc6ff15624d9d2.tar.gz
Merge pull request #3039 from chef/tball/nightlies
Chef-DK nightlies on debian and el6 have been failing on these timing-based tests, doing a quick fix
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r--spec/spec_helper.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 0695450142..fb284c721b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -110,6 +110,7 @@ RSpec.configure do |config|
# Tests that randomly fail, but may have value.
config.filter_run_excluding :volatile => true
config.filter_run_excluding :volatile_on_solaris => true if solaris?
+ config.filter_run_excluding :volatile_from_verify => false
# Add jruby filters here
config.filter_run_excluding :windows_only => true unless windows?