From 6865636d51eed5eeb875e050f1a27faeeb92633c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathieu=20Gagne=CC=81?= <mgagne@iweb.com>
Date: Thu, 30 Jan 2014 17:52:49 -0500
Subject: [PATCH] Cleanup rspec tests of nova::conductor

Change-Id: I649318e2936d8de0b565fd59c1f758d367477c0e
---
 spec/classes/nova_conductor_spec.rb | 45 +++++++----------------------
 1 file changed, 11 insertions(+), 34 deletions(-)

diff --git a/spec/classes/nova_conductor_spec.rb b/spec/classes/nova_conductor_spec.rb
index 59c546087..96e30df21 100644
--- a/spec/classes/nova_conductor_spec.rb
+++ b/spec/classes/nova_conductor_spec.rb
@@ -6,48 +6,25 @@ describe 'nova::conductor' do
     'include nova'
   end
 
-  context 'on redhat' do
-
-    let :facts do
-      { :osfamily => 'redhat' }
-    end
-
-
-    it { should contain_nova__generic_service('conductor').with(
-      :enabled        => false,
-      :package_name   => 'openstack-nova-conductor',
-      :service_name   => 'openstack-nova-conductor',
-      :ensure_package => 'present'
-    )}
-
-  end
-
-  context 'on debian' do
-
+  context 'on Debian platforms' do
     let :facts do
       { :osfamily => 'Debian' }
     end
 
-    it { should contain_nova__generic_service('conductor').with(
-      :enabled        => false,
-      :package_name   => 'nova-conductor',
-      :service_name   => 'nova-conductor',
-      :ensure_package => 'present'
-    )}
-
+    it_behaves_like 'generic nova service', {
+      :name         => 'nova-conductor',
+      :package_name => 'nova-conductor',
+      :service_name => 'nova-conductor' }
   end
 
-  context 'with params' do
+  context 'on RedHat platforms' do
     let :facts do
-      {:osfamily => 'Debian' }
-    end
-    let :params do
-    { :enabled => true, :ensure_package => 'latest' }
+      { :osfamily => 'RedHat' }
     end
 
-    it { should contain_nova__generic_service('conductor').with(
-      :enabled        => true,
-      :ensure_package => 'latest'
-    ) }
+    it_behaves_like 'generic nova service', {
+      :name         => 'nova-conductor',
+      :package_name => 'openstack-nova-conductor',
+      :service_name => 'openstack-nova-conductor' }
   end
 end