diff options
| author | Paul Glass <paul.glass@rackspace.com> | 2016-03-30 16:39:27 +0000 |
|---|---|---|
| committer | Paul Glass <paul.glass@rackspace.com> | 2016-03-30 17:07:48 +0000 |
| commit | a5e8206ed602c11cc2ea8fbca25b39999cfd5540 (patch) | |
| tree | 31e70987d44fe6e56eb4e04b58ad0c578ce9f172 /designateclient/functionaltests | |
| parent | d89f0a3889a8d258b2d3d73c6ed202f6fc9cafc3 (diff) | |
| download | python-designateclient-a5e8206ed602c11cc2ea8fbca25b39999cfd5540.tar.gz | |
Show responses on zone and recordset deletes
Change-Id: I1b15c64bac1bc495fe7aecbcf08c28b8ea41b5a7
Diffstat (limited to 'designateclient/functionaltests')
| -rw-r--r-- | designateclient/functionaltests/client.py | 5 | ||||
| -rw-r--r-- | designateclient/functionaltests/v2/test_recordsets.py | 10 | ||||
| -rw-r--r-- | designateclient/functionaltests/v2/test_zone.py | 5 |
3 files changed, 9 insertions, 11 deletions
diff --git a/designateclient/functionaltests/client.py b/designateclient/functionaltests/client.py index 0bac078..69ca2ca 100644 --- a/designateclient/functionaltests/client.py +++ b/designateclient/functionaltests/client.py @@ -79,7 +79,8 @@ class ZoneCommands(object): **kwargs) def zone_delete(self, id, *args, **kwargs): - return self.parsed_cmd('zone delete %s' % id, *args, **kwargs) + return self.parsed_cmd('zone delete %s' % id, FieldValueModel, *args, + **kwargs) def zone_create(self, name, email=None, ttl=None, description=None, type=None, masters=None, *args, **kwargs): @@ -214,7 +215,7 @@ class RecordsetCommands(object): def recordset_delete(self, zone_id, id, *args, **kwargs): cmd = 'recordset delete {0} {1}'.format(zone_id, id) - return self.parsed_cmd(cmd, *args, **kwargs) + return self.parsed_cmd(cmd, FieldValueModel, *args, **kwargs) class TLDCommands(object): diff --git a/designateclient/functionaltests/v2/test_recordsets.py b/designateclient/functionaltests/v2/test_recordsets.py index e104ba4..d8bc2af 100644 --- a/designateclient/functionaltests/v2/test_recordsets.py +++ b/designateclient/functionaltests/v2/test_recordsets.py @@ -69,13 +69,9 @@ class TestRecordset(BaseDesignateTest): self.assertEqual(self.recordset.zone_id, self.zone.id) def test_recordset_delete(self): - self.clients.recordset_delete(self.zone.id, self.recordset.id) - self.assertRaises( - CommandFailed, - self.clients.recordset_delete, - self.zone.id, - self.recordset.id, - ) + rset = self.clients.recordset_delete(self.zone.id, self.recordset.id) + self.assertEqual(rset.action, 'DELETE') + self.assertEqual(rset.status, 'PENDING') def test_recordset_set(self): rset = self.clients.recordset_set( diff --git a/designateclient/functionaltests/v2/test_zone.py b/designateclient/functionaltests/v2/test_zone.py index 85927e8..2873948 100644 --- a/designateclient/functionaltests/v2/test_zone.py +++ b/designateclient/functionaltests/v2/test_zone.py @@ -55,8 +55,9 @@ class TestZone(BaseDesignateTest): self.assertEqual(self.zone.version, zone.version) def test_zone_delete(self): - self.clients.zone_delete(self.zone.id) - self.assertRaises(CommandFailed, self.clients.zone_show, self.zone.id) + zone = self.clients.zone_delete(self.zone.id) + self.assertEqual(zone.action, 'DELETE') + self.assertEqual(zone.status, 'PENDING') def test_zone_set(self): ttl = int(self.zone.ttl) + 123 |