File tree Expand file tree Collapse file tree 3 files changed +21
-3
lines changed Expand file tree Collapse file tree 3 files changed +21
-3
lines changed Original file line number Diff line number Diff line change 6363            grant :    'all' , 
6464            port :     params [ :database_port ] . to_i , 
6565            encoding : 'UTF8' , 
66-             locale :   'en_US .UTF-8' 
66+             locale :   'C .UTF-8' 
6767          ) 
6868      } 
6969
Original file line number Diff line number Diff line change 77    context  "on #{ os }   do 
88      let ( :facts )  {  facts  } 
99
10+       let ( :termini_package_name )  do 
11+       case  facts [ :os ] [ 'family' ] 
12+       when  'Archlinux' ,  'OpenBSD' 
13+         'puppetdb-termini' 
14+       when  'Debian' ,  'RedHat' ,  'Suse' 
15+         'openvoxdb-termini' 
16+       end 
17+       end 
18+ 
1019      context  'when PuppetDB on remote server'  do 
1120        context  'when using default values'  do 
1221          it  {  is_expected . to  compile . with_all_deps  } 
6271        end 
6372
6473        context  'when using default values'  do 
65-           it  {  is_expected . to  contain_package ( 'puppetdb-termini' ) . with ( ensure : 'present' )  } 
74+           it  {  is_expected . to  contain_package ( termini_package_name ) . with ( ensure : 'present' )  } 
6675          it  {  is_expected . to  contain_puppetdb_conn_validator ( 'puppetdb_conn' ) . with ( test_url : '/pdb/meta/v1/version' )  } 
6776        end 
6877
Original file line number Diff line number Diff line change 1414    end 
1515  end 
1616
17+   let ( :package_name )  do 
18+     case  facts [ :os ] [ 'family' ] 
19+     when  'Archlinux' ,  'OpenBSD' 
20+       'puppetdb' 
21+     when  'Debian' ,  'RedHat' ,  'Suse' 
22+       'openvoxdb' 
23+     end 
24+   end 
25+ 
1726  on_supported_os . each  do  |os ,  facts |
1827    context  "on #{ os }   do 
1928      let ( :facts )  {  facts  } 
2837        it  {  is_expected . to  contain_class ( 'puppetdb::server::puppetdb' )  } 
2938
3039        it  { 
31-           is_expected . to  contain_package ( 'puppetdb' ) . 
40+           is_expected . to  contain_package ( package_name ) . 
3241            that_notifies ( 'Service[puppetdb]' ) 
3342        } 
3443
 
 
   
 
     
   
   
          
    
    
     
    
      
     
     
    You can’t perform that action at this time.
  
 
    
  
    
      
        
     
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments