Fix query and xml tests

Gemfile

@@ -18,7 +18,7 @@ end
 gem 'json'
 gem 'nokogiri', '>= 1.6.8.1'
 gem 'oga'
-gem 'rexml', '= 3.2.6' # Temporary Workaround (https://github.com/ruby/rexml/issues/131)
+gem 'rexml'
 # These protocol parsers do not have java gems
 unless defined?(JRUBY_VERSION)
   gem 'libxml-ruby'

build_tools/aws-sdk-code-generator/spec/protocol-tests-ignore-list.json

@@ -11,14 +11,5 @@
         "engines": ["nokogiri"]
       }
     }
-  },
-  "query": {
-    "input": {},
-    "output": {
-      "QueryCustomizedError": {
-        "description": "Under investigation",
-        "engines": ["ox", "nokogiri", "rexml", "libxml", "oga"]
-      }
-    }
   }
 }

build_tools/aws-sdk-code-generator/spec/protocol-tests/output/query.json

@@ -519,7 +519,7 @@
                     ]
                 },
                 "description": "Parses customized XML errors",
-                "errorCode": "CustomCodeError",
+                "errorCode": "Customized",
                 "errorMessage": "Hi",
                 "error": {
                     "Message": "Hi"

build_tools/aws-sdk-code-generator/spec/protocol_tests_spec_helper.rb

@@ -314,7 +314,13 @@ def match_resp_data(test_case, http_resp, it)
         expected_data =
           if error_case?(test_case)
             error_shape = http_resp.context.operation.errors.find do |err|
-              err.shape.name == test_case['errorCode']
+              shape =
+                if err.shape['error']
+                  err.shape['error']['code']
+                else
+                  err.shape.name
+                end
+              shape == test_case['errorCode']
             end
             raise "Unable to find #{test_case['errorCode']} in error shapes" if error_shape.nil?
 
@@ -380,6 +386,8 @@ def normalize_headers(hash)
 
       def normalize_xml(xml)
         REXML::Document.new(xml).to_s.gsub(/>\s+?</, '><').strip
+      rescue REXML::ParseException
+        xml # payload
       end
 
       def error_case?(test_case)

gems/aws-sdk-core/spec/aws/stubbing/protocols/rest_xml_spec.rb

@@ -88,11 +88,7 @@ def normalize(xml)
             operation = api.operation(:get_bucket_policy)
             resp = RestXml.new.stub_data(api, operation, params)
             expect(resp.status_code).to eq(200)
-            expect(normalize(resp.body.string)).to eq(normalize(<<-JSON))
-              {
-                "Policy": "policy-document"
-              }
-            JSON
+            expect(resp.body.string).to eq('policy-document')
           end
 
           it 'can stub errors' do