diff options
| author | Claire McQuin <claire@getchef.com> | 2014-11-07 10:46:21 -0800 |
|---|---|---|
| committer | Claire McQuin <claire@getchef.com> | 2014-11-07 10:46:21 -0800 |
| commit | d8eb915d73ad2d132a0b58526e035502e45d2e5e (patch) | |
| tree | 14c30a4f0e73a02cafa6e6179f6a6678d63af0b2 /spec/integration/knife | |
| parent | 4fa0ea6f9b942d407b83712ec53e19447ddfa39b (diff) | |
| parent | bf6340a113dd0c37e2084c70007d201742f11e9d (diff) | |
| download | chef-d8eb915d73ad2d132a0b58526e035502e45d2e5e.tar.gz | |
Merge branch 'master' into mcquin/rspec-3
Diffstat (limited to 'spec/integration/knife')
| -rw-r--r-- | spec/integration/knife/serve_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/integration/knife/serve_spec.rb b/spec/integration/knife/serve_spec.rb index dd3fa5c0d1..7bf7d29b40 100644 --- a/spec/integration/knife/serve_spec.rb +++ b/spec/integration/knife/serve_spec.rb @@ -31,14 +31,14 @@ describe 'knife serve', :workstation do exception = nil t = Thread.new do begin - knife('serve --chef-zero-port=8889') + knife('serve --chef-zero-port=8890') rescue exception = $! end end begin Chef::Config.log_level = :debug - Chef::Config.chef_server_url = 'http://localhost:8889' + Chef::Config.chef_server_url = 'http://localhost:8890' Chef::Config.node_name = nil Chef::Config.client_key = nil api = Chef::ServerAPI.new |