Merge "WSME version >=0.7 correctly returns a 405"

ceilometer/tests/gabbi/gabbits/alarms.yaml

@@ -11,13 +11,7 @@ tests:
   response_strings:
       - "[]"
 
-# TODO(chdent) because of the way _lookup is used in the
-# AlarmsController pecan is unable to correctly create a 405
-# when it receives a PUT to /v2/alarms. This is partially
-# fixable in Ceilometer by raising an exception in _lookup if
-# alarm_id is not present, but no Allow header will be created.
 - name: try to PUT an alarm
-  xfail: true
   desc: what does PUT do
   url: /v2/alarms
   method: PUT

ceilometer/tests/gabbi/gabbits/meters.yaml

@@ -24,18 +24,18 @@ tests:
       status: 406
 
     - name: meters list bad method
-      desc: https://bugs.launchpad.net/ceilometer/+bug/1426476
-      xfail: true
       url: /v2/meters
       method: POST
       status: 405
+      response_headers:
+          allow: GET
 
     - name: try to delete meters
-      desc: https://bugs.launchpad.net/ceilometer/+bug/1426476
-      xfail: true
       url: /v2/meters
       method: DELETE
-      status: 405 # actual response is 404, at least we can't delete
+      status: 405
+      response_headers:
+          allow: GET
 
 # Generic HTTP health explorations of single meter.
 

ceilometer/tests/gabbi/gabbits/samples.yaml

@@ -125,11 +125,11 @@ tests:
       status: 406
 
     - name: bad method
-      desc: https://bugs.launchpad.net/ceilometer/+bug/1426476
-      xfail: true
       url: /v2/samples
       method: POST
       status: 405
+      response_headers:
+          allow: GET
 
 # Work with just one sample.