Merge pull request #181 from bodepd/fix_test_failures

fix test failures

.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"

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

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

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

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') }

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

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

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

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