-
Notifications
You must be signed in to change notification settings - Fork 314
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1672 from biinari/remove-spork
Remove spork
- Loading branch information
Showing
5 changed files
with
149 additions
and
164 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,82 +1,76 @@ | ||
| require "spork" | ||
|
|
||
| def windows? | ||
| !!(RUBY_PLATFORM =~ /mswin|mingw|windows/) | ||
| end | ||
|
|
||
| Spork.prefork do | ||
| require "aruba/cucumber" | ||
| require "aruba/in_process" | ||
| require "aruba/spawn_process" | ||
| require "cucumber/rspec/doubles" | ||
| require "berkshelf/api/rspec" unless windows? | ||
| require "berkshelf/api/cucumber" unless windows? | ||
|
|
||
| Dir["spec/support/**/*.rb"].each { |f| require File.expand_path(f) } | ||
|
|
||
| World(Berkshelf::RSpec::PathHelpers) | ||
| World(Berkshelf::RSpec::Kitchen) | ||
|
|
||
| CHEF_SERVER_PORT = 26310 | ||
| BERKS_API_PORT = 26210 | ||
|
|
||
| at_exit do | ||
| Berkshelf::RSpec::ChefServer.stop | ||
| Berkshelf::API::RSpec::Server.stop unless windows? | ||
| end | ||
|
|
||
| Before do | ||
|
|
||
| # Legacy ENV variables until we can move over to all InProcess | ||
| Berkshelf.instance_variable_set(:@berkshelf_path, nil) | ||
| ENV["BERKSHELF_PATH"] = berkshelf_path.to_s | ||
| ENV["BERKSHELF_CONFIG"] = Berkshelf.config.path.to_s | ||
| ENV["BERKSHELF_CHEF_CONFIG"] = chef_config_path.to_s | ||
|
|
||
| aruba.config.command_launcher = :in_process | ||
| aruba.config.main_class = Berkshelf::Cli::Runner | ||
| @dirs = ["spec/tmp/aruba"] # set aruba's temporary directory | ||
|
|
||
| stub_kitchen! | ||
| clean_tmp_path | ||
| Berkshelf.initialize_filesystem | ||
| Berkshelf::CookbookStore.instance.initialize_filesystem | ||
| reload_configs | ||
| Berkshelf::CachedCookbook.instance_variable_set(:@loaded_cookbooks, nil) | ||
|
|
||
| endpoints = [ | ||
| { | ||
| type: "chef_server", | ||
| options: { | ||
| url: "http://localhost:#{CHEF_SERVER_PORT}", | ||
| client_name: "reset", | ||
| client_key: File.expand_path("spec/config/berkshelf.pem"), | ||
| }, | ||
| }, | ||
| ] | ||
| require "aruba/cucumber" | ||
| require "aruba/in_process" | ||
| require "aruba/spawn_process" | ||
| require "cucumber/rspec/doubles" | ||
| require "berkshelf/api/rspec" unless windows? | ||
| require "berkshelf/api/cucumber" unless windows? | ||
|
|
||
| Dir["spec/support/**/*.rb"].each { |f| require File.expand_path(f) } | ||
|
|
||
| World(Berkshelf::RSpec::PathHelpers) | ||
| World(Berkshelf::RSpec::Kitchen) | ||
|
|
||
| CHEF_SERVER_PORT = 26310 | ||
| BERKS_API_PORT = 26210 | ||
|
|
||
| Berkshelf::RSpec::ChefServer.start(port: CHEF_SERVER_PORT) | ||
| Berkshelf::API::RSpec::Server.start(port: BERKS_API_PORT, endpoints: endpoints) unless windows? | ||
| at_exit do | ||
| Berkshelf::RSpec::ChefServer.stop | ||
| Berkshelf::API::RSpec::Server.stop unless windows? | ||
| end | ||
|
|
||
| aruba.config.io_wait_timeout = Cucumber::JRUBY ? 7 : 5 | ||
| @aruba_timeout_seconds = Cucumber::JRUBY ? 35 : 15 | ||
| end | ||
| Before do | ||
|
|
||
| # Legacy ENV variables until we can move over to all InProcess | ||
| Berkshelf.instance_variable_set(:@berkshelf_path, nil) | ||
| ENV["BERKSHELF_PATH"] = berkshelf_path.to_s | ||
| ENV["BERKSHELF_CONFIG"] = Berkshelf.config.path.to_s | ||
| ENV["BERKSHELF_CHEF_CONFIG"] = chef_config_path.to_s | ||
|
|
||
| aruba.config.command_launcher = :in_process | ||
| aruba.config.main_class = Berkshelf::Cli::Runner | ||
| @dirs = ["spec/tmp/aruba"] # set aruba's temporary directory | ||
|
|
||
| stub_kitchen! | ||
| clean_tmp_path | ||
| Berkshelf.initialize_filesystem | ||
| Berkshelf::CookbookStore.instance.initialize_filesystem | ||
| reload_configs | ||
| Berkshelf::CachedCookbook.instance_variable_set(:@loaded_cookbooks, nil) | ||
|
|
||
| endpoints = [ | ||
| { | ||
| type: "chef_server", | ||
| options: { | ||
| url: "http://localhost:#{CHEF_SERVER_PORT}", | ||
| client_name: "reset", | ||
| client_key: File.expand_path("spec/config/berkshelf.pem"), | ||
| }, | ||
| }, | ||
| ] | ||
|
|
||
| Before("@spawn") do | ||
| aruba.config.command_launcher = :spawn | ||
| Berkshelf::RSpec::ChefServer.start(port: CHEF_SERVER_PORT) | ||
| Berkshelf::API::RSpec::Server.start(port: BERKS_API_PORT, endpoints: endpoints) unless windows? | ||
|
|
||
| Berkshelf.instance_variable_set(:@berkshelf_path, nil) | ||
| set_environment_variable("BERKSHELF_PATH", berkshelf_path.to_s) | ||
| set_environment_variable("BERKSHELF_CONFIG", Berkshelf.config.path.to_s) | ||
| set_environment_variable("BERKSHELF_CHEF_CONFIG", chef_config_path.to_s) | ||
| end | ||
| aruba.config.io_wait_timeout = Cucumber::JRUBY ? 7 : 5 | ||
| @aruba_timeout_seconds = Cucumber::JRUBY ? 35 : 15 | ||
| end | ||
|
|
||
| Before("@slow_process") do | ||
| aruba.config.io_wait_timeout = Cucumber::JRUBY ? 70 : 30 | ||
| @aruba_timeout_seconds = Cucumber::JRUBY ? 140 : 60 | ||
| end | ||
| Before("@spawn") do | ||
| aruba.config.command_launcher = :spawn | ||
|
|
||
| Berkshelf.instance_variable_set(:@berkshelf_path, nil) | ||
| set_environment_variable("BERKSHELF_PATH", berkshelf_path.to_s) | ||
| set_environment_variable("BERKSHELF_CONFIG", Berkshelf.config.path.to_s) | ||
| set_environment_variable("BERKSHELF_CHEF_CONFIG", chef_config_path.to_s) | ||
| end | ||
|
|
||
| Spork.each_run do | ||
| require "berkshelf/cli" | ||
| Before("@slow_process") do | ||
| aruba.config.io_wait_timeout = Cucumber::JRUBY ? 70 : 30 | ||
| @aruba_timeout_seconds = Cucumber::JRUBY ? 140 : 60 | ||
| end | ||
|
|
||
| require "berkshelf/cli" |
Oops, something went wrong.