diff options
| author | Bryan McLellan <btm@opscode.com> | 2011-02-04 14:16:40 -0800 |
|---|---|---|
| committer | Bryan McLellan <btm@opscode.com> | 2011-02-04 14:16:40 -0800 |
| commit | bb5b864f61aecf42873f078ec65924a96fb290df (patch) | |
| tree | 60cdce07f17194fcab5b73aaf38be22091c379ad | |
| parent | 7cb947ac30ce39c48da8bdf971b2ecde24bdb4aa (diff) | |
| parent | abc2b4c57aac4ff18c0f028a005d60fe28668a1c (diff) | |
| download | chef-bb5b864f61aecf42873f078ec65924a96fb290df.tar.gz | |
Merge branch 'CHEF-1866' into 0.9-stable
| -rw-r--r-- | features/support/env.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/features/support/env.rb b/features/support/env.rb index e26b81cb86..e5b3c3db44 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -293,12 +293,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 |