diff options
author | Tim Smith <tsmith84@gmail.com> | 2020-08-19 22:58:00 -0700 |
---|---|---|
committer | Tim Smith <tsmith84@gmail.com> | 2020-08-19 22:58:00 -0700 |
commit | 7cd521c4eca28cf24a1ae15f77d983db2be2e6a0 (patch) | |
tree | 770a7a5416f000ef96c5c2e16d12359054b37347 /spec | |
parent | 7e2d8e6a1b23cf459becfaaf0525a930bb2bd9e3 (diff) | |
download | chef-zero-7cd521c4eca28cf24a1ae15f77d983db2be2e6a0.tar.gz |
Optimize our requires
Avoid requiring things that are already defined. Rubygems is very slow at traversing the filesystem.
Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'spec')
-rw-r--r-- | spec/run_oc_pedant.rb | 6 | ||||
-rw-r--r-- | spec/server_spec.rb | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/spec/run_oc_pedant.rb b/spec/run_oc_pedant.rb index b1760b6..13cfa5a 100644 --- a/spec/run_oc_pedant.rb +++ b/spec/run_oc_pedant.rb @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -require "json" +require "json" unless defined?(JSON) require "bundler" require "bundler/setup" @@ -93,7 +93,7 @@ begin tmpdir = nil server = if ENV["FILE_STORE"] - require "tmpdir" + require "tmpdir" unless defined?(Dir.mktmpdir) require "chef_zero/data_store/raw_file_store" tmpdir = Dir.mktmpdir data_store = ChefZero::DataStore::RawFileStore.new(tmpdir, true) @@ -102,7 +102,7 @@ begin start_chef_server(data_store: data_store) elsif ENV["CHEF_FS"] - require "tmpdir" + require "tmpdir" unless defined?(Dir.mktmpdir) tmpdir = Dir.mktmpdir start_cheffs_server(tmpdir) diff --git a/spec/server_spec.rb b/spec/server_spec.rb index 2305880..75f31b9 100644 --- a/spec/server_spec.rb +++ b/spec/server_spec.rb @@ -1,6 +1,6 @@ require "chef_zero/server" -require "net/http" -require "uri" +require "net/http" unless defined?(Net::HTTP) +require "uri" unless defined?(URI) describe ChefZero::Server do context "with a server bound to port 8889" do |