From 97b7fc6581da09a958ed732329ba4fcf84d03fb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20Gagne=CC=81?= Date: Thu, 30 Jan 2014 17:51:27 -0500 Subject: [PATCH] Cleanup rspec tests of nova::consoleauth Change-Id: I14f5aa56c0d326b1b172266f6767682f1c052edc --- spec/classes/nova_consoleauth_spec.rb | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/spec/classes/nova_consoleauth_spec.rb b/spec/classes/nova_consoleauth_spec.rb index 43d2b8923..ef739bcef 100644 --- a/spec/classes/nova_consoleauth_spec.rb +++ b/spec/classes/nova_consoleauth_spec.rb @@ -6,20 +6,25 @@ describe 'nova::consoleauth' do 'include nova' end - describe 'on debian platforms' do + context 'on Debian platforms' do let :facts do { :osfamily => 'Debian' } end - describe 'with package version' do - let :params do - {:ensure_package => '2012.1-2'} - end - it { should contain_package('nova-consoleauth').with( - 'ensure' => '2012.1-2' - )} - end - + it_behaves_like 'generic nova service', { + :name => 'nova-consoleauth', + :package_name => 'nova-consoleauth', + :service_name => 'nova-consoleauth' } end + context 'on RedHat platforms' do + let :facts do + { :osfamily => 'RedHat' } + end + + it_behaves_like 'generic nova service', { + :name => 'nova-consoleauth', + :package_name => 'openstack-nova-console', + :service_name => 'openstack-nova-consoleauth' } + end end