(PE-39577) test updates

Author: davidmalloncares

plans/convert.pp

@@ -65,9 +65,9 @@
   }
 
   # Add legacy compiler role to compilers that are missing it
-  $compilers_with_legacy_compiler_flag = $cert_extensions_temp.filter |$name,$exts| {
+  $compilers_with_legacy_compiler_flag = $cert_extensions_temp.filter |$name, $exts| {
     ($name in $compiler_targets.map |$t| { $t.name } or $name in $legacy_compiler_targets.map |$t| { $t.name }) and
-    ($exts[peadm::oid('peadm_legacy_compiler')] != undef)
+    ($exts[peadm::oid('peadm_legacy_compiler')] and $exts[peadm::oid('peadm_legacy_compiler')] != undef)
   }
 
   if $compilers_with_legacy_compiler_flag.size > 0 {

spec/plans/add_compilers_spec.rb

@@ -57,6 +57,7 @@ def allow_standard_non_returning_calls
       expect_plan('peadm::util::copy_file').be_called_times(1)
       expect_task('peadm::puppet_runonce').with_targets(['compiler'])
       expect_task('peadm::puppet_runonce').with_targets(['server_a'])
+      expect_task('peadm::check_pe_master_rules').with_targets(['primary'])
       expect(run_plan('peadm::add_compilers', params)).to be_ok
     end
 
@@ -72,6 +73,7 @@ def allow_standard_non_returning_calls
       expect_task('peadm::puppet_runonce').with_targets(['compiler'])
       expect_task('peadm::puppet_runonce').with_targets(['server_a'])
       expect_task('peadm::puppet_runonce').with_targets(['server_b'])
+      expect_task('peadm::check_pe_master_rules').with_targets(['primary'])
       expect(run_plan('peadm::add_compilers', params_with_avail_group_b)).to be_ok
     end
 
@@ -85,6 +87,7 @@ def allow_standard_non_returning_calls
       expect_plan('peadm::util::copy_file').be_called_times(1)
       expect_task('peadm::puppet_runonce').with_targets(['compiler'])
       expect_task('peadm::puppet_runonce').with_targets(['custom_postgresql'])
+      expect_task('peadm::check_pe_master_rules').with_targets(['primary'])
       expect(run_plan('peadm::add_compilers', params_with_primary_postgresql_host)).to be_ok
     end
 
@@ -100,6 +103,7 @@ def allow_standard_non_returning_calls
       expect_plan('peadm::util::copy_file').be_called_times(1)
       expect_task('peadm::puppet_runonce').with_targets(['compiler'])
       expect_task('peadm::puppet_runonce').with_targets(['external_postgresql'])
+      expect_task('peadm::check_pe_master_rules').with_targets(['primary'])
       expect(run_plan('peadm::add_compilers', params)).to be_ok
     end
 
@@ -116,6 +120,7 @@ def allow_standard_non_returning_calls
       expect_task('peadm::puppet_runonce').with_targets(['compiler'])
       expect_task('peadm::puppet_runonce').with_targets(['external_postgresql'])
       expect_task('peadm::puppet_runonce').with_targets(['replica'])
+      expect_task('peadm::check_pe_master_rules').with_targets(['primary'])
       expect(run_plan('peadm::add_compilers', params)).to be_ok
     end
 
@@ -131,6 +136,7 @@ def allow_standard_non_returning_calls
       expect_task('peadm::puppet_runonce').with_targets(['compiler'])
       expect_task('peadm::puppet_runonce').with_targets(['replica_external_postgresql'])
       expect_task('peadm::puppet_runonce').with_targets(['server_a'])
+      expect_task('peadm::check_pe_master_rules').with_targets(['primary'])
       expect(run_plan('peadm::add_compilers', params_with_avail_group_b)).to be_ok
     end
   end