diff --git a/tests/data/valid_describe_zone.json b/tests/data/valid_describe_zone.json index 5a4cf60..4df5d0c 100644 --- a/tests/data/valid_describe_zone.json +++ b/tests/data/valid_describe_zone.json @@ -4,7 +4,7 @@ "zone": [ { "localstorageenabled": true, - "name": "CH-GV2", + "name": "zonename", "zonetoken": "ccb0a60c-79c8-3230-ab8b-8bdbe8c45bb7", "securitygroupsenabled": true, "allocationstate": "Enabled", diff --git a/tests/zones_tests.py b/tests/zones_tests.py index 04d0a2b..f9d3c3a 100644 --- a/tests/zones_tests.py +++ b/tests/zones_tests.py @@ -13,12 +13,39 @@ class ZonesTestCase(GStackAppTestCase): def test_list_zones(self): get = mock.Mock() - get.return_value.text = read_file('tests/data/zones_search.json') + get.return_value.text = read_file('tests/data/valid_describe_zone.json') get.return_value.status_code = 200 with mock.patch('requests.get', get): headers = {'authorization': 'Bearer ' + str(GStackAppTestCase.access_token)} - print headers response = self.get('/compute/v1/projects/exampleproject/zones', headers=headers) self.assert_ok(response) + + def test_get_zone(self): + + get = mock.Mock() + get.return_value.text = read_file('tests/data/valid_describe_zone.json') + get.return_value.status_code = 200 + + with mock.patch('requests.get', get): + headers = {'authorization': 'Bearer ' + str(GStackAppTestCase.access_token)} + response = self.get('/compute/v1/projects/exampleproject/zones/zonename', headers=headers) + + self.assert_ok(response) + + def test_get_zone_not_found(self): + + get = mock.Mock() + get.return_value.text = read_file('tests/data/empty_describe_zone.json') + get.return_value.status_code = 200 + + with mock.patch('requests.get', get): + headers = {'authorization': 'Bearer ' + str(GStackAppTestCase.access_token)} + response = self.get('/compute/v1/projects/exampleproject/zones/zonename', headers=headers) + + print response.data + + self.assert_not_found(response) + assert 'The resource \'/compute/v1/projects/exampleproject/zones/zonename\' was not found' \ + in response.data