diff options
| author | jkeiser <jkeiser@opscode.com> | 2013-01-20 14:33:14 -0800 |
|---|---|---|
| committer | John Keiser <jkeiser@opscode.com> | 2013-06-07 13:12:25 -0700 |
| commit | 60cdaa1ec495f156b8424e094cc28bbc73c5768a (patch) | |
| tree | ea2598e1f871424ad15d05032acad8b67f7e5812 /spec/integration/knife/diff_spec.rb | |
| parent | 79557d0b72fd0cc91015de2a0ad016c09759084b (diff) | |
| download | chef-60cdaa1ec495f156b8424e094cc28bbc73c5768a.tar.gz | |
Print error for bad json in knife upload
Diffstat (limited to 'spec/integration/knife/diff_spec.rb')
| -rw-r--r-- | spec/integration/knife/diff_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/integration/knife/diff_spec.rb b/spec/integration/knife/diff_spec.rb index 9a4cc73db1..cf49dbef74 100644 --- a/spec/integration/knife/diff_spec.rb +++ b/spec/integration/knife/diff_spec.rb @@ -292,8 +292,8 @@ EOM environment 'x', {} when_the_repository 'has an environment with bad JSON' do file 'environments/x.json', '{' - it 'knife diff reports a warning and does a textual diff' do - knife('diff /environments/x.json').should_succeed(/- "name": "x"/, :stderr => "ERROR: Parse error reading #{path_to('environments/x.json')} as JSON: A JSON text must at least contain two octets!\n") + it 'knife diff reports an error and does a textual diff' do + knife('diff /environments/x.json').should_succeed(/- "name": "x"/, :stderr => "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: A JSON text must at least contain two octets!\n") end end end |