Remove gabbi tests that check content-locationkilo-eol2015.1.4stable/kilo

The content-location header is an artifact of using httplib2
and not something that ceilometer itself returns. Gabbi is going
to stop using httplib2 (and so is much of OpenStack) so to prepare
for that these tests need to stop testing something that doesn't
really mean anything.

Closes-Bug: #1560987

Change-Id: If5aacaf108402146d66fee474793dde1c0a59a7c
(cherry picked from commit 639b9476bd8554bee93512a81ae24605c766f080)
(cherry picked from commit 6563e6b08ba07dcd24bd99406fc801e04f2e7864)
(cherry picked from commit 9404e73f6c24bc72e25ead7338ce536bb7d86346)

2 files changed, 0 insertions, 20 deletions

diff --git a/ceilometer/tests/gabbi/gabbits/api_events_no_data.yaml b/ceilometer/tests/gabbi/gabbits/api_events_no_data.yaml
index ed9f1b97..0e71d9bf 100644
--- a/ceilometer/tests/gabbi/gabbits/api_events_no_data.yaml
+++ b/ceilometer/tests/gabbi/gabbits/api_events_no_data.yaml
@@ -11,7 +11,6 @@ tests:
   url: /v2/events
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/events
   response_strings:
       - "[]"
 
@@ -26,7 +25,6 @@ tests:
   url: /v2/events?q.field=event_type&q.op=eq&q.type=string&q.value=cookies_chocolate.chip
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/events?q.field=event_type&q.op=eq&q.type=string&q.value=cookies_chocolate.chip
   response_strings:
       - "[]"
 
@@ -44,7 +42,6 @@ tests:
           value: cookies_chocolate.chip
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/events
   response_strings:
       - "[]"
 
@@ -54,7 +51,6 @@ tests:
   url: /v2/events?q.field=bad_field&q.op=eq&q.type=string&q.value=cookies_chocolate.chip
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/events?q.field=bad_field&q.op=eq&q.type=string&q.value=cookies_chocolate.chip
   response_strings:
       - "[]"
 
@@ -72,7 +68,6 @@ tests:
           value: cookies_chocolate.chip
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/events
   response_strings:
       - "[]"
 
@@ -114,7 +109,6 @@ tests:
   url: /v2/event_types
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/event_types
   response_strings:
       - "[]"
 
@@ -128,7 +122,6 @@ tests:
   url: /v2/event_types/cookies_chocolate.chip/traits
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/event_types/cookies_chocolate.chip/traits
   response_strings:
       - "[]"
 
@@ -137,6 +130,5 @@ tests:
   url: /v2/event_types/cookies_chocolate.chip/traits/ate
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/event_types/cookies_chocolate.chip/traits/ate
   response_strings:
       - "[]"
diff --git a/ceilometer/tests/gabbi/gabbits/api_events_with_data.yaml b/ceilometer/tests/gabbi/gabbits/api_events_with_data.yaml
index d87b3825..55698250 100644
--- a/ceilometer/tests/gabbi/gabbits/api_events_with_data.yaml
+++ b/ceilometer/tests/gabbi/gabbits/api_events_with_data.yaml
@@ -10,7 +10,6 @@ tests:
   url: /v2/events
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/events
   response_json_paths:
       $.[0].event_type: cookies_chocolate.chip
       $.[0].traits.[0].value: chocolate.chip
@@ -36,7 +35,6 @@ tests:
   url: /v2/events?q.field=event_type&q.op=eq&q.type=string&q.value=cookies_chocolate.chip
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/events?q.field=event_type&q.op=eq&q.type=string&q.value=cookies_chocolate.chip
   response_json_paths:
       $.[0].event_type: cookies_chocolate.chip
       $.[0].traits.[0].value: chocolate.chip
@@ -55,7 +53,6 @@ tests:
           value: cookies_chocolate.chip
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/events
   response_json_paths:
       $.[0].event_type: cookies_chocolate.chip
       $.[0].traits.[0].value: chocolate.chip
@@ -66,7 +63,6 @@ tests:
   url: /v2/events?q.field=bad_field&q.op=eq&q.type=string&q.value=cookies_chocolate.chip
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/events?q.field=bad_field&q.op=eq&q.type=string&q.value=cookies_chocolate.chip
   response_strings:
       - "[]"
 
@@ -84,7 +80,6 @@ tests:
           value: cookies_chocolate.chip
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/events
   response_strings:
       - "[]"
 
@@ -108,7 +103,6 @@ tests:
   url: /v2/events/fea1b15a-1d47-4175-85a5-a4bb2c729240
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/events/fea1b15a-1d47-4175-85a5-a4bb2c729240
   response_json_paths:
       $.event_type: cookies_chocolate.chip
       $.traits.[0].value: chocolate.chip
@@ -124,7 +118,6 @@ tests:
   url: /v2/event_types
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/event_types
   response_strings:
       - cookies_chocolate.chip
       - cookies_peanut.butter
@@ -145,7 +138,6 @@ tests:
   url: /v2/event_types/cookies_chocolate.chip/traits
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/event_types/cookies_chocolate.chip/traits
   response_json_paths:
       $.[0].type: string
       $.[1].name: ate
@@ -155,7 +147,6 @@ tests:
   url: /v2/event_types/bad_event_type/traits
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/event_types/bad_event_type/traits
   response_strings:
       - "[]"
 
@@ -165,7 +156,6 @@ tests:
   url: /v2/event_types/cookies_chocolate.chip/traits/ate
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/event_types/cookies_chocolate.chip/traits/ate
   response_json_paths:
       $.[0].name: ate
       $.[0].value: '0'
@@ -176,7 +166,6 @@ tests:
   url: /v2/event_types/bad_event_type/traits/ate
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/event_types/bad_event_type/traits/ate
   response_strings:
       - "[]"
 
@@ -186,6 +175,5 @@ tests:
   url: /v2/event_types/cookies_chocolate.chip/traits/bad_trait_name
   response_headers:
       content-type: application/json; charset=UTF-8
-      content-location: $SCHEME://$NETLOC/v2/event_types/cookies_chocolate.chip/traits/bad_trait_name
   response_strings:
       - "[]"