Skip to content

Commit 2c9e150

Browse files
tox fixes
1 parent 8a2088c commit 2c9e150

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

SoftLayer/CLI/config/setup.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@
55
import click
66

77
import SoftLayer
8-
from SoftLayer import auth
98
from SoftLayer.CLI import config
109
from SoftLayer.CLI import environment
1110
from SoftLayer.CLI import exceptions
1211
from SoftLayer.CLI import formatting
13-
from SoftLayer import transports
1412
from SoftLayer import utils
1513

1614

SoftLayer/CLI/order/item_list.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ def sort_items(items):
7676

7777
return sorted_items
7878

79+
7980
def get_price(item):
81+
"""Given an SoftLayer_Product_Item, returns its default price id"""
8082

8183
for price in item.get('prices', []):
8284
if not price.get('locationGroupId'):

tests/CLI/modules/config_tests.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ def test_setup(self, mocked_input, getpass, confirm_mock):
7373
'AAAAAAAAAAAAAAAAAAAAAAAAAAAAA' in contents)
7474
self.assertTrue('endpoint_url = %s' % consts.API_PUBLIC_ENDPOINT in contents)
7575

76-
7776
@mock.patch('SoftLayer.CLI.formatting.confirm')
7877
@mock.patch('SoftLayer.CLI.environment.Environment.getpass')
7978
@mock.patch('SoftLayer.CLI.environment.Environment.input')

tests/CLI/modules/order_tests.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,9 @@ def test_item_list(self):
3838

3939
self.assert_no_fail(result)
4040
self.assert_called_with('SoftLayer_Product_Package', 'getItems')
41-
expected_results = [{'category': 'testing',
42-
'keyName': 'item1',
43-
'description': 'description1'},
44-
{'category': 'testing',
45-
'keyName': 'item2',
46-
'description': 'description2'}]
47-
self.assertEqual(expected_results, json.loads(result.output))
41+
self.assertIn('description2', result.output)
42+
self.assertIn('testing', result.output)
43+
self.assertIn('item2', result.output)
4844

4945
def test_package_list(self):
5046
p_mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')

0 commit comments

Comments
 (0)