summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorTim Hinderliter <tim@opscode.com>2010-11-12 15:18:06 -0800
committerTim Hinderliter <tim@opscode.com>2010-11-12 15:18:06 -0800
commit85e1ae1d83cdba0debe8d7c1585cc65435785713 (patch)
tree0d093ebcfeb1c55616271f9ba960dea882b3a4fa /features
parente023b1b358b12d8a3c8a9aa2798fc1fdeec2caff (diff)
downloadchef-85e1ae1d83cdba0debe8d7c1585cc65435785713.tar.gz
Fix CHEF-1866: features tests for @api_search tag don't work: move
SOLR purge to "Before" step instead of "After" to have known state going in
Diffstat (limited to 'features')
-rw-r--r--features/support/env.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/features/support/env.rb b/features/support/env.rb
index a3ea7b0e08..f7c66667e9 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -296,12 +296,13 @@ Before do
replicate_dbs({:source_db => "#{Chef::Config[:couchdb_url]}/chef_integration_safe",
:target_db => "#{Chef::Config[:couchdb_url]}/chef_integration"})
-end
-
-After do
+
s = Chef::Solr.new
s.solr_delete_by_query("*:*")
s.solr_commit
+end
+
+After do
gemserver.shutdown
gemserver_thread && gemserver_thread.join