diff options
| author | David Workman <workmad3@gmail.com> | 2014-09-04 21:05:20 +0100 |
|---|---|---|
| committer | David Workman <workmad3@gmail.com> | 2014-09-04 21:05:20 +0100 |
| commit | d3e373eb2412b9b0727f015c5f8ed0453fa891a8 (patch) | |
| tree | 2510ead883dab49b2250c33d6cf2c84aef53c6da | |
| parent | 10621b23c26cd813cc8559d61105bf8be20e0c37 (diff) | |
| download | chef-d3e373eb2412b9b0727f015c5f8ed0453fa891a8.tar.gz | |
Fixing travis-ci failure.
Travis-CI runs failed due to Chef::Application::Apply picking
up the explicit --format parameter and attempting to use it.
Using ARGV.clear before a call to @app.reconfigure fixes this
failure for now.
Also a whitespace modification in apply.rb
| -rw-r--r-- | lib/chef/application/apply.rb | 1 | ||||
| -rw-r--r-- | spec/unit/application/apply_spec.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/application/apply.rb b/lib/chef/application/apply.rb index 7e5d5406c0..a88f0c0c46 100644 --- a/lib/chef/application/apply.rb +++ b/lib/chef/application/apply.rb @@ -31,7 +31,6 @@ class Chef::Application::Apply < Chef::Application banner "Usage: chef-apply [RECIPE_FILE] [-e RECIPE_TEXT] [-s]" - option :execute, :short => "-e RECIPE_TEXT", :long => "--execute RECIPE_TEXT", diff --git a/spec/unit/application/apply_spec.rb b/spec/unit/application/apply_spec.rb index 3f7fb851c2..9844640b47 100644 --- a/spec/unit/application/apply_spec.rb +++ b/spec/unit/application/apply_spec.rb @@ -28,6 +28,7 @@ describe Chef::Application::Apply do describe "configuring the application" do it "should set solo mode to true" do + ARGV.clear @app.reconfigure Chef::Config[:solo].should be_true end |