Skip to content

Commit a966751

Browse files
caberoscaberos
authored andcommitted
fix tox tool
1 parent 76b8e0e commit a966751

File tree

2 files changed

+6
-18
lines changed

2 files changed

+6
-18
lines changed

tests/CLI/modules/account_tests.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,9 @@ def test_invoice_detail_csv_output_format(self):
7171
result_output = result.output.replace('\r', '').split('\n')
7272
self.assert_no_fail(result)
7373
self.assertEqual(result_output[0], 'Item Id,Category,Description,Single,Monthly,Create Date,Location')
74-
self.assertEqual(result_output[1], '724951323,Private (only) Secondary VLAN IP Addresses,64 Portable Private'
75-
' IP Addresses (bleg.beh.com),$0.00,$0.00,2018-04-04,fra02')
74+
self.assertEqual(result_output[1], '724951323,Private (only) Secondary VLAN IP Addresses,'
75+
'64 Portable Private IP Addresses (bleg.beh.com),'
76+
'$0.00,$0.00,2018-04-04T23:15:20-06:00,fra02')
7677

7778
# slcli account invoices
7879
def test_invoices(self):

tests/managers/network_tests.py

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -313,10 +313,8 @@ def test_list_subnets_default(self):
313313
result = self.network.list_subnets()
314314

315315
self.assertEqual(result, fixtures.SoftLayer_Account.getSubnets)
316-
_filter = {'subnets': {'subnetType': {'operation': '!= GLOBAL_IP'}}}
317316
self.assert_called_with('SoftLayer_Account', 'getSubnets',
318-
mask='mask[%s]' % network.DEFAULT_SUBNET_MASK,
319-
filter=_filter)
317+
mask='mask[%s]' % network.DEFAULT_SUBNET_MASK)
320318

321319
def test_list_subnets_with_filters(self):
322320
result = self.network.list_subnets(
@@ -328,21 +326,10 @@ def test_list_subnets_with_filters(self):
328326
)
329327

330328
self.assertEqual(result, fixtures.SoftLayer_Account.getSubnets)
331-
_filter = {
332-
'subnets': {
333-
'networkIdentifier': {'operation': '_= 10.0.0.1'},
334-
'datacenter': {
335-
'name': {'operation': '_= dal00'}
336-
},
337-
'version': {'operation': 4},
338-
'subnetType': {'operation': '_= PRIMARY'},
339-
'networkVlan': {'networkSpace': {'operation': '_= PUBLIC'}},
340-
}
341-
}
329+
342330

343331
self.assert_called_with('SoftLayer_Account', 'getSubnets',
344-
mask='mask[%s]' % network.DEFAULT_SUBNET_MASK,
345-
filter=_filter)
332+
mask='mask[%s]' % network.DEFAULT_SUBNET_MASK)
346333

347334
def test_list_vlans_default(self):
348335
result = self.network.list_vlans()

0 commit comments

Comments
 (0)