(PUP-9648) Update beaker tests

Fix serveral tests that hardcoded pson and hadn't been updated to use json.

Delete the test for verifying preferred_serialization_format. I manually
verified that if the pson feature is disabled on the puppetserver host, then
puppetserver responds with HTTP 406 as expected.

Author: joshcooper

acceptance/lib/puppet/acceptance/module_utils.rb

@@ -44,7 +44,7 @@ def get_default_modulepath_for_host(host)
       # @param host [String] hostname
       # @return [Array] paths for found modules
       def get_installed_modules_for_host(host)
-        on host, puppet("module list --render-as pson")
+        on host, puppet("module list --render-as json")
         str  = stdout.lines.to_a.last
         pat = /\(([^()]+)\)/
         mods =  str.scan(pat).flatten

acceptance/tests/language/exported_resources.rb

@@ -17,7 +17,7 @@
     step 'stop puppet server' do
       on(master, "service #{master['puppetservice']} stop")
     end
-    step 'remove cached agent pson catalogs from the master' do
+    step 'remove cached agent json catalogs from the master' do
       on(master, "rm -f #{File.join(master.puppet['yamldir'],'catalog','*')}",
          :accept_all_exit_codes => true)
     end
@@ -33,10 +33,10 @@
     end
   end
 
-  storeconfigs_backend_name = 'pson_storeconfigs'
+  storeconfigs_backend_name = 'json_storeconfigs'
   step 'create a yaml storeconfigs terminus in the modulepath' do
     moduledir = File.join(environmentpath,tmp_environment,'modules')
-    terminus_class_name = 'PsonStoreconfigs'
+    terminus_class_name = 'JsonStoreconfigs'
     manifest = <<MANIFEST
 File {
   ensure => directory,
@@ -64,8 +64,8 @@ def save(request)
         # This is quite likely a bad idea, since we are not managing ownership or modes.
         Dir.mkdir(basedir) unless Puppet::FileSystem.exist?(basedir)
         begin
-          # We cannot dump anonymous modules in yaml, so dump to json/pson
-          File.open(file, "w") { |f| f.write request.instance.to_pson }
+          # We cannot dump anonymous modules in yaml, so dump to json
+          File.open(file, "w") { |f| f.write request.instance.to_json }
         rescue TypeError => detail
           Puppet.err "Could not save \#{self.name} \#{request.key}: \#{detail}"
         end
@@ -108,7 +108,7 @@ class Puppet::Resource::#{terminus_class_name} < Puppet::Indirector::Yaml
       def search(request)
         catalog_dir = File.join(Puppet.run_mode.server? ? Puppet[:yamldir] : Puppet[:clientyamldir], "catalog", "*")
         results = Dir.glob(catalog_dir).collect { |file|
-          catalog = Puppet::Resource::Catalog.convert_from(:pson, File.read(file))
+          catalog = Puppet::Resource::Catalog.convert_from(:json, File.read(file))
           if catalog.name == request.options[:host]
             next
           end

acceptance/tests/security/cve-2013-1652_improper_query_params.rb

@@ -26,7 +26,7 @@
 
       cert_path = on(agent, puppet('agent', "--configprint hostcert")).stdout.chomp
       key_path = on(agent, puppet('agent', "--configprint hostprivkey")).stdout.chomp
-      curl_base = "curl --tlsv1 -g --cert \"#{cert_path}\" --key \"#{key_path}\" -k -H 'Accept: pson'"
+      curl_base = "curl --tlsv1 -g --cert \"#{cert_path}\" --key \"#{key_path}\" -k -H 'Accept: application/json'"
 
       curl_call =  "#{curl_base} '#{payload}'"
 

acceptance/tests/security/cve-2013-1652_poison_other_node_cache.rb

@@ -21,7 +21,7 @@
       master, puppet('agent', "--configprint hostprivkey")).stdout.chomp
 
     curl_base = "curl --tlsv1 -g --cert \"#{cert_path}\" " +
-                "--key \"#{key_path}\" -k -H 'Accept: pson'"
+                "--key \"#{key_path}\" -k -H 'Accept: application/json'"
 
     step "Attempt to poison the master's node cache" do
       yamldir = puppet_config(master, 'yamldir', section: 'master')