diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-10 04:04:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-10 04:04:00 +0000 |
| commit | 09aa7ef3c9c862b2a55ad7600e7df98b50639c83 (patch) | |
| tree | 38c6aac664bf17d09f2d3f2aa0fc242345b6d69a | |
| parent | d46c28b30c10fd1f6718add98be9cfc8682b3f8b (diff) | |
| parent | 6f5e5817aab2753f2029db00b8774d032187592f (diff) | |
| download | ceilometer-09aa7ef3c9c862b2a55ad7600e7df98b50639c83.tar.gz | |
Merge "gabbi: use history"
| -rw-r--r-- | ceilometer/tests/integration/gabbi/gabbits-live/autoscaling.yaml | 18 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
2 files changed, 5 insertions, 15 deletions
diff --git a/ceilometer/tests/integration/gabbi/gabbits-live/autoscaling.yaml b/ceilometer/tests/integration/gabbi/gabbits-live/autoscaling.yaml index b4428ab9..f0435f38 100644 --- a/ceilometer/tests/integration/gabbi/gabbits-live/autoscaling.yaml +++ b/ceilometer/tests/integration/gabbi/gabbits-live/autoscaling.yaml @@ -50,7 +50,7 @@ tests: response_json_paths: $.stack.stack_status: "CREATE_COMPLETE" - - name: list servers + - name: list servers grow desc: Wait the autoscaling stack grow to two servers url: $ENVIRON['NOVA_SERVICE_URL']/servers/detail method: GET @@ -75,16 +75,6 @@ tests: - '"id": "$RESPONSE["$.servers[0].id"]"' - '"id": "$RESPONSE["$.servers[1].id"]"' - - name: list servers again - desc: grab servers to check for events - url: $ENVIRON['NOVA_SERVICE_URL']/servers/detail - method: GET - poll: - count: 5 - delay: 1 - response_json_paths: - $.servers.`len`: 2 - - name: check event desc: Check panko for new instance.create.end event url: $ENVIRON['PANKO_SERVICE_URL']/v2/events @@ -100,14 +90,14 @@ tests: - field: resource_id op: eq type: string - value: $RESPONSE['$.servers[0].id'] + value: $HISTORY['list servers grow'].$RESPONSE['$.servers[0].id'] poll: count: 30 delay: 1 response_json_paths: $.`len`: 1 $[0].event_type: compute.instance.create.end - $[0].traits[?(@.name='resource_id')].value: $RESPONSE['$.servers[0].id'] + $[0].traits[?(@.name='resource_id')].value: $HISTORY['list servers grow'].$RESPONSE['$.servers[0].id'] - name: check alarm desc: Check the aodh alarm and its state @@ -160,7 +150,7 @@ tests: response_json_paths: $.stack.stack_status: "UPDATE_COMPLETE" - - name: list servers + - name: list servers shrink desc: Wait the autoscaling stack shrink to one server url: $ENVIRON['NOVA_SERVICE_URL']/servers/detail method: GET diff --git a/test-requirements.txt b/test-requirements.txt index 68ba3d15..d426c186 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -23,7 +23,7 @@ sphinxcontrib-pecanwsme>=0.8 # Apache-2.0 testrepository>=0.0.18 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD testtools>=1.4.0 # MIT -gabbi>=1.11.0 # Apache-2.0 +gabbi>=1.30.0 # Apache-2.0 requests-aws>=0.1.4 # BSD License (3 clause) os-testr>=0.4.1 # Apache-2.0 tempest>=14.0.0 # Apache-2.0 |