Skip to content

Commit 4b1fa0e

Browse files
committed
More unittests were added to increase the coverage, an else conditional was removed since it will never be executed
1 parent 5e926fe commit 4b1fa0e

File tree

2 files changed

+36
-9
lines changed

2 files changed

+36
-9
lines changed

SoftLayer/CLI/dns/record_add.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,19 +75,16 @@ def cli(env, record, type, data, zone, ttl, priority, protocol, port, service, w
7575
zone_id = helpers.resolve_id(manager.resolve_ids, zone, name='zone')
7676

7777
if type == 'MX':
78-
result = manager.create_record_mx(zone_id, record, data, ttl=ttl, priority=priority)
78+
manager.create_record_mx(zone_id, record, data, ttl=ttl, priority=priority)
7979
elif type == 'SRV':
80-
result = manager.create_record_srv(zone_id, record, data, protocol, port, service,
81-
ttl=ttl, priority=priority, weight=weight)
80+
manager.create_record_srv(zone_id, record, data, protocol, port, service,
81+
ttl=ttl, priority=priority, weight=weight)
8282
else:
83-
result = manager.create_record(zone_id, record, type, data, ttl=ttl)
83+
manager.create_record(zone_id, record, type, data, ttl=ttl)
8484

8585
elif type == 'PTR':
86-
result = manager.create_record_ptr(record, data, ttl=ttl)
86+
manager.create_record_ptr(record, data, ttl=ttl)
8787
else:
8888
raise exceptions.CLIAbort("%s isn't a valid record type or zone is missing" % (type))
8989

90-
if result:
91-
click.secho("%s record added successfully" % (type), fg='green')
92-
else:
93-
click.secho("Failed to add %s record" % (type), fg='red')
90+
click.secho("%s record added successfully" % (type), fg='green')

tests/CLI/modules/dns_tests.py

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,36 @@ def test_add_record(self):
7878
self.assert_no_fail(result)
7979
self.assertEqual(str(result.output), 'A record added successfully\n')
8080

81+
def test_add_record_mx(self):
82+
result = self.run_command(['dns', 'record-add', 'hostname', 'MX',
83+
'data', '--zone=1234', '--ttl=100', '--priority=25'])
84+
85+
self.assert_no_fail(result)
86+
self.assertEqual(str(result.output), 'MX record added successfully\n')
87+
88+
def test_add_record_srv(self):
89+
result = self.run_command(['dns', 'record-add', 'hostname', 'SRV',
90+
'data', '--zone=1234', '--protocol=udp',
91+
'--port=88', '--ttl=100', '--weight=5'])
92+
93+
self.assert_no_fail(result)
94+
self.assertEqual(str(result.output), 'SRV record added successfully\n')
95+
96+
def test_add_record_ptr(self):
97+
result = self.run_command(['dns', 'record-add', '192.168.1.1', 'PTR',
98+
'hostname', '--ttl=100'])
99+
100+
self.assert_no_fail(result)
101+
self.assertEqual(str(result.output), 'PTR record added successfully\n')
102+
103+
def test_add_record_abort(self):
104+
result = self.run_command(['dns', 'record-add', 'hostname', 'A',
105+
'data', '--ttl=100'])
106+
107+
self.assertEqual(result.exit_code, 2)
108+
self.assertIsInstance(result.exception, exceptions.CLIAbort)
109+
self.assertEqual(result.exception.message, "A isn't a valid record type or zone is missing")
110+
81111
@mock.patch('SoftLayer.CLI.formatting.no_going_back')
82112
def test_delete_record(self, no_going_back_mock):
83113
no_going_back_mock.return_value = True

0 commit comments

Comments
 (0)