From 83f887fc23c2e45fc92c3294fe8c1ab9739b0d3c Mon Sep 17 00:00:00 2001
From: Mark Vanderwiel <vanderwl@us.ibm.com>
Date: Thu, 8 Oct 2015 11:48:45 -0500
Subject: [PATCH] Try new ChefDK 9.0

Since it's early for us in the M release, we could consider upgrading
ChefDK.  This patch is a test run for that.  Probably need a test run
for the Repo as well before making a decision.

Cleanup minor unit test warning

Change-Id: I9dd80cd10ac0eacfc7146eec48d862dc2f3d7dc2
---
 bootstrap.sh     | 2 +-
 spec/cli_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 2ab7b983..fca5a37c 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -5,7 +5,7 @@
 sudo apt-get -y install build-essential liblzma-dev zlib1g-dev
 
 # install chefdk
-chefdk=chefdk_0.7.0-1_amd64.deb
+chefdk=chefdk_0.9.0-1_amd64.deb
 wget -nv -t 3 https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/x86_64/$chefdk
 sudo dpkg -i $chefdk
 rm $chefdk
diff --git a/spec/cli_spec.rb b/spec/cli_spec.rb
index d31c8529..27717f33 100644
--- a/spec/cli_spec.rb
+++ b/spec/cli_spec.rb
@@ -124,7 +124,7 @@ describe 'openstack-common::default' do
         allow(subject).to receive(:openstack_command).with('glance', 'image-list', :env, {})
           .and_raise("No image with a name or ID of 'test' exists. (1)")
 
-        expect { subject.image_id('test', :env) }.to raise_error
+        expect { subject.image_id('test', :env) }.to raise_error(RuntimeError)
       end
     end