summaryrefslogtreecommitdiff
path: root/spec/integration
diff options
context:
space:
mode:
authorjkeiser <jkeiser@opscode.com>2013-01-17 17:25:35 -0800
committerJohn Keiser <jkeiser@opscode.com>2013-06-07 13:12:22 -0700
commit40812216e3d2b56caa26b5e8702c675c1d1b870f (patch)
treecdf2ae06a7d7106a23aa338e28f474f773d4421a /spec/integration
parent1a83676f2b47936bdec8e8f7a5cc01f06f0ba63f (diff)
downloadchef-40812216e3d2b56caa26b5e8702c675c1d1b870f.tar.gz
Disable tests that fail in Ruby 1.8 due to unavoidable hash output ordering
Diffstat (limited to 'spec/integration')
-rw-r--r--spec/integration/knife/raw_spec.rb8
-rw-r--r--spec/integration/knife/show_spec.rb4
2 files changed, 6 insertions, 6 deletions
diff --git a/spec/integration/knife/raw_spec.rb b/spec/integration/knife/raw_spec.rb
index b36dd78e77..129e2a80a4 100644
--- a/spec/integration/knife/raw_spec.rb
+++ b/spec/integration/knife/raw_spec.rb
@@ -15,7 +15,7 @@ describe 'knife raw' do
role 'x', '{}'
user 'x', '{}'
- it 'knife raw /nodes/x returns the node' do
+ it 'knife raw /nodes/x returns the node', :pending => (RUBY_VERSION < "1.9") do
knife('raw /nodes/x').should_succeed <<EOM
{
"name": "x",
@@ -41,7 +41,7 @@ EOM
knife('raw /blarghle').should_fail(/ERROR: Server responded with error 404 "Not Found"/)
end
- it 'knife raw -m DELETE /roles/x succeeds' do
+ it 'knife raw -m DELETE /roles/x succeeds', :pending => (RUBY_VERSION < "1.9") do
knife('raw -m DELETE /roles/x').should_succeed <<EOM
{
"name": "x",
@@ -62,7 +62,7 @@ EOM
knife('show /roles/x.json').should_fail "ERROR: /roles/x.json: No such file or directory\n"
end
- it 'knife raw -m PUT -i blah.txt /roles/x succeeds' do
+ it 'knife raw -m PUT -i blah.txt /roles/x succeeds', :pending => (RUBY_VERSION < "1.9") do
Tempfile.open('raw_put_input') do |file|
file.write <<EOM
{
@@ -121,7 +121,7 @@ EOM
end
end
- it 'knife raw -m POST -i blah.txt /roles succeeds' do
+ it 'knife raw -m POST -i blah.txt /roles succeeds', :pending => (RUBY_VERSION < "1.9") do
Tempfile.open('raw_put_input') do |file|
file.write <<EOM
{
diff --git a/spec/integration/knife/show_spec.rb b/spec/integration/knife/show_spec.rb
index 97a14bfe85..fe38f9b58f 100644
--- a/spec/integration/knife/show_spec.rb
+++ b/spec/integration/knife/show_spec.rb
@@ -52,7 +52,7 @@ EOM
}
EOM
end
- it 'knife show /environments/x.json shows the remote version' do
+ it 'knife show /environments/x.json shows the remote version', :pending => (RUBY_VERSION < "1.9") do
knife('show /environments/x.json').should_succeed <<EOM
/environments/x.json:
{
@@ -77,7 +77,7 @@ EOM
}
EOM
end
- it 'knife show /roles/x.json shows the remote version' do
+ it 'knife show /roles/x.json shows the remote version', :pending => (RUBY_VERSION < "1.9") do
knife('show /roles/x.json').should_succeed <<EOM
/roles/x.json:
{