From 124ae530fce10518090975816cf9af8e0eb002e3 Mon Sep 17 00:00:00 2001
From: Dan Bode <dan@puppetlabs.com>
Date: Fri, 2 Nov 2012 11:12:39 -0700
Subject: [PATCH] fix test failures

make them work!
lazy tests, always want handouts :(
---
 .fixtures.yml                         | 1 +
 spec/classes/nova_api_spec.rb         | 2 +-
 spec/classes/nova_cert_spec.rb        | 4 ++--
 spec/classes/nova_compute_spec.rb     | 4 ++--
 spec/classes/nova_init_spec.rb        | 2 +-
 spec/classes/nova_network_spec.rb     | 2 +-
 spec/classes/nova_objectstore_spec.rb | 4 ++--
 spec/classes/nova_scheduler_spec.rb   | 2 +-
 spec/classes/nova_volume_spec.rb      | 2 +-
 9 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index 5956b90ca..4aae02111 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -2,6 +2,7 @@ fixtures:
   repositories:
     "apt": "git://github.com/puppetlabs/puppetlabs-apt.git"
     "keystone": "git://github.com/puppetlabs/puppetlabs-keystone.git"
+    "cinder": "git://github.com/puppetlabs/puppetlabs-cinder.git"
     "mysql": "git://github.com/puppetlabs/puppetlabs-mysql.git"
     "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
     "sysctl": "git://github.com/duritong/puppet-sysctl.git"
diff --git a/spec/classes/nova_api_spec.rb b/spec/classes/nova_api_spec.rb
index bb98a5e57..6bae49059 100644
--- a/spec/classes/nova_api_spec.rb
+++ b/spec/classes/nova_api_spec.rb
@@ -104,6 +104,6 @@ describe 'nova::api' do
       'ensure'  => 'stopped',
       'enable'  => false
     )}
-    it { should_not contain_package('nova-api') }
+    it { should contain_package('nova-api').with_name('openstack-nova-api') }
   end
 end
diff --git a/spec/classes/nova_cert_spec.rb b/spec/classes/nova_cert_spec.rb
index 0a4979700..fa09e3c50 100644
--- a/spec/classes/nova_cert_spec.rb
+++ b/spec/classes/nova_cert_spec.rb
@@ -37,7 +37,7 @@ describe 'nova::cert' do
       it { should contain_package('nova-cert').with(
         'ensure' => '2012.1-2'
       )}
-    end        
+    end
   end
   describe 'on rhel' do
     let :facts do
@@ -48,6 +48,6 @@ describe 'nova::cert' do
       'ensure'  => 'stopped',
       'enable'  => false
     )}
-    it { should_not contain_package('nova-cert') }
+    it { should contain_package('nova-cert').with_name('openstack-nova-cert') }
   end
 end
diff --git a/spec/classes/nova_compute_spec.rb b/spec/classes/nova_compute_spec.rb
index 8d307961f..ddd7c2e1b 100644
--- a/spec/classes/nova_compute_spec.rb
+++ b/spec/classes/nova_compute_spec.rb
@@ -71,7 +71,7 @@ describe 'nova::compute' do
         it { should contain_package('nova-compute').with(
           'ensure' => '2012.1-2'
         )}
-      end        
+      end
     end
     describe 'on rhel' do
       let :facts do
@@ -82,7 +82,7 @@ describe 'nova::compute' do
         'ensure'  => 'stopped',
         'enable'  => false
       )}
-      it { should_not contain_package('nova-compute') }
+      it { should contain_package('nova-compute').with_name('openstack-nova-compute') }
     end
   end
 end
diff --git a/spec/classes/nova_init_spec.rb b/spec/classes/nova_init_spec.rb
index f9db69ae8..9a7f7e0c2 100644
--- a/spec/classes/nova_init_spec.rb
+++ b/spec/classes/nova_init_spec.rb
@@ -123,7 +123,7 @@ describe 'nova' do
         {:osfamily => 'RedHat'}
       end
       it { should contain_package('nova-common').with(
-        'name'   => 'openstack-nova',
+        'name'   => 'openstack-nova-common',
         'ensure' => 'present'
       )}
       it { should contain_nova_config('rootwrap_config').with_value('/etc/nova/rootwrap.conf') }
diff --git a/spec/classes/nova_network_spec.rb b/spec/classes/nova_network_spec.rb
index 68b58372e..629893e97 100644
--- a/spec/classes/nova_network_spec.rb
+++ b/spec/classes/nova_network_spec.rb
@@ -207,6 +207,6 @@ describe 'nova::network' do
       'ensure'  => 'stopped',
       'enable'  => false
     )}
-    it { should_not contain_package('nova-network') }
+    it { should contain_package('nova-network').with_name('openstack-nova-network') }
   end
 end
diff --git a/spec/classes/nova_objectstore_spec.rb b/spec/classes/nova_objectstore_spec.rb
index 7ec8c1a3c..4d4a2f7c8 100644
--- a/spec/classes/nova_objectstore_spec.rb
+++ b/spec/classes/nova_objectstore_spec.rb
@@ -37,7 +37,7 @@ describe 'nova::objectstore' do
       it { should contain_package('nova-objectstore').with(
         'ensure' => '2012.1-2'
       )}
-    end    
+    end
   end
   describe 'on rhel' do
     let :facts do
@@ -48,6 +48,6 @@ describe 'nova::objectstore' do
       'ensure'  => 'stopped',
       'enable'  => false
     )}
-    it { should_not contain_package('nova-objectstore') }
+    it { should contain_package('nova-objectstore').with('openstack-nova-objectstore') }
   end
 end
diff --git a/spec/classes/nova_scheduler_spec.rb b/spec/classes/nova_scheduler_spec.rb
index e82872be9..7bb91b6a4 100644
--- a/spec/classes/nova_scheduler_spec.rb
+++ b/spec/classes/nova_scheduler_spec.rb
@@ -48,6 +48,6 @@ describe 'nova::scheduler' do
       'ensure'  => 'stopped',
       'enable'  => false
     )}
-    it { should_not contain_package('nova-scheduler') }
+    it { should contain_package('nova-scheduler').with_name('openstack-nova-scheduler') }
   end
 end
diff --git a/spec/classes/nova_volume_spec.rb b/spec/classes/nova_volume_spec.rb
index 6a940593e..62c15f4a0 100644
--- a/spec/classes/nova_volume_spec.rb
+++ b/spec/classes/nova_volume_spec.rb
@@ -48,6 +48,6 @@ describe 'nova::volume' do
       'ensure'   => 'stopped',
       'enable'   => false
     )}
-    it { should_not contain_package('nova-volume') }
+    it { should contain_package('nova-volume').with_name('openstack-nova-volume') }
   end
 end