(gh-19) Track pdb integration in acceptance suite

Because some older platforms may not have postgresql packages,
we may not be able to setup openvoxdb for testing alongside
openvox-server, and the pre-suite step 95_install_pdb skips if
postgresql is not available.

Two later tests, 00_smoke/puppetdb_integration and catalog/v4_catalog
are affected by this. The former made the same test as 95_install_pdb to
determine whether to skip, and the later just checked for existence of
pdb configuration files as evidence it should execute with pdb
integration. This would work because the install_pdb step formerly gated
withether a pdb package was installed at all.

Since the suite now expects to be able to run with openvoxdb installed
before Beaker executes, I'm changing how this works. The
pre-suite/foss/95_install_pdb still gates whether pdb is configured
based on postgresql gems, but now marks a class instance variable to
indicate that pdb integration should be expected by later tests.

Both the puppetdb_integration and the v4_catalog tests now use the
test_with_pdb? method to check whether they should skip/run with pdb
integration.

Author: jpartlow

acceptance/lib/helper.rb

@@ -71,6 +71,23 @@ def unsupported_postgresql_platform?(host)
 
   class << self
     attr_reader :config
+    # Flag to indicate whether tests should expect to be able to
+    # interoperate with an openvoxdb instance.
+    attr_accessor :pdb_integration_expected
+  end
+
+  # Set in pre_suite/foss/95_install_pdb.rb if the platform
+  # has postgresql available. After this, other tests
+  # can check test_with_pdb?() to determine if they should
+  # skip or test pdb related functionality.
+  def mark_pdb_integration_expected
+    PuppetServerExtensions.pdb_integration_expected = true
+  end
+
+  # Returns true if the tests should expect to be able to
+  # interoperate with an openvoxdb instance.
+  def test_with_pdb?
+    PuppetServerExtensions.pdb_integration_expected
   end
 
   # Return the configuration hash initialized by

acceptance/suites/pre_suite/foss/95_install_pdb.rb

@@ -1,7 +1,10 @@
-skip_test('No Postgresql packages available for this platform') if unsupported_postgresql_platform?(master)
+test_name 'PuppetDB setup'
+
 skip_test('Skipped for fips') if master.fips_mode?
+skip_test('No Postgresql packages available for this platform') if unsupported_postgresql_platform?(master)
+
+mark_pdb_integration_expected
 
-test_name 'PuppetDB setup'
 sitepp = '/etc/puppetlabs/code/environments/production/manifests/site.pp'
 
 teardown do

acceptance/suites/tests/00_smoke/puppetdb_integration.rb

@@ -15,9 +15,10 @@
 ## to ensure that metrics related to PuppetDB communication were recorded.
 #
 
-# We only run this test if we'll have puppetdb installed, which is gated in
-# acceptance/suites/pre_suite/foss/95_install_pdb.rb using the same conditional
-skip_test('openvoxdb was not configured on this platform due to lack of postgresql packages') if unsupported_postgresql_platform?(master)
+# We only run this test if we'll have puppetdb installed and
+# configured, which is gated in
+# acceptance/suites/pre_suite/foss/95_install_pdb.rb.
+skip_test('openvoxdb was not configured on this platform due to lack of postgresql packages') if !test_with_pdb?
 skip_test('Skipped for fips') if master.fips_mode?
 skip_test if master.is_pe?
 

acceptance/suites/tests/catalog/v4_catalog.rb

@@ -32,10 +32,7 @@
 
   old_puppet_conf = puppet_conf_for(master, {})
   testdir = master.tmpdir('v4catalog')
-  pdb = on(master,
-              '[ -d /etc/puppetlabs/puppetdb ]',
-              allow_failure).
-              exit_code == 0
+  pdb = test_with_pdb?
 
   def conf_for(non_root_agent)
     <<PUPPETCONF