Skip to content

Commit 0b94a90

Browse files
tox style fixes
1 parent 786cacf commit 0b94a90

3 files changed

Lines changed: 5 additions & 9 deletions

File tree

SoftLayer/CLI/virt/capture.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from SoftLayer.CLI import formatting
99
from SoftLayer.CLI import helpers
1010

11-
from pprint import pprint as pp
1211

1312
# pylint: disable=redefined-builtin
1413

@@ -25,7 +24,7 @@ def cli(env, identifier, name, all, note):
2524
vs_id = helpers.resolve_id(vsi.resolve_ids, identifier, 'VS')
2625

2726
capture = vsi.capture(vs_id, name, all, note)
28-
pp(capture)
27+
2928
table = formatting.KeyValueTable(['name', 'value'])
3029
table.align['name'] = 'r'
3130
table.align['value'] = 'l'

tests/CLI/modules/vs/vs_create_tests.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import sys
99
import tempfile
1010

11-
from SoftLayer import fixtures
1211
from SoftLayer.fixtures import SoftLayer_Product_Package as SoftLayer_Product_Package
1312
from SoftLayer import testing
1413

@@ -185,7 +184,6 @@ def test_create_with_integer_image_guid(self, confirm_mock):
185184
'networkComponents': [{'maxSpeed': '100'}]
186185
},)
187186

188-
189187
self.assert_called_with('SoftLayer_Virtual_Guest', 'generateOrderTemplate', args=args)
190188
self.assert_called_with('SoftLayer_Product_Order', 'placeOrder')
191189

@@ -544,7 +542,7 @@ def test_create_with_ipv6(self, confirm_mock):
544542
self.assertEqual([], self.calls('SoftLayer_Virtual_Guest', 'setTags'))
545543

546544
@mock.patch('SoftLayer.CLI.formatting.confirm')
547-
def test_create_with_ipv6(self, confirm_mock):
545+
def test_create_with_ipv6_no_test(self, confirm_mock):
548546
confirm_mock.return_value = True
549547
amock = self.set_mock('SoftLayer_Product_Package', 'getItems')
550548
amock.return_value = SoftLayer_Product_Package.getItems_1_IPV6_ADDRESS
@@ -597,8 +595,8 @@ def test_create_vs_export(self):
597595
@mock.patch('SoftLayer.CLI.formatting.confirm')
598596
def test_create_with_userdata(self, confirm_mock):
599597
result = self.run_command(['vs', 'create', '--hostname', 'TEST', '--domain', 'TESTING',
600-
'--flavor', 'B1_2X8X25', '--datacenter', 'TEST00', '--os', 'UBUNTU_LATEST',
601-
'--userdata', 'This is my user data ok'])
598+
'--flavor', 'B1_2X8X25', '--datacenter', 'TEST00', '--os', 'UBUNTU_LATEST',
599+
'--userdata', 'This is my user data ok'])
602600
self.assert_no_fail(result)
603601
expected_guest = [
604602
{
@@ -610,4 +608,4 @@ def test_create_with_userdata(self, confirm_mock):
610608
# Returns a list of API calls that hit SL_Product_Order::placeOrder
611609
api_call = self.calls('SoftLayer_Product_Order', 'placeOrder')
612610
# Doing this because the placeOrder args are huge and mostly not needed to test
613-
self.assertEqual(api_call[0].args[0]['virtualGuests'], expected_guest)
611+
self.assertEqual(api_call[0].args[0]['virtualGuests'], expected_guest)

tests/CLI/modules/vs/vs_tests.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,4 +660,3 @@ def test_vs_capture(self):
660660
result = self.run_command(['vs', 'capture', '100', '--name', 'TestName'])
661661
self.assert_no_fail(result)
662662
self.assert_called_with('SoftLayer_Virtual_Guest', 'createArchiveTransaction', identifier=100)
663-

0 commit comments

Comments
 (0)