Skip to content

Commit 4d2d288

Browse files
tox fixes
1 parent 2fe5c71 commit 4d2d288

File tree

5 files changed

+5
-18
lines changed

5 files changed

+5
-18
lines changed

.secrets.baseline

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2023-10-12T22:45:35Z",
6+
"generated_at": "2023-10-12T23:00:01Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -533,7 +533,7 @@
533533
{
534534
"hashed_secret": "6367c48dd193d56ea7b0baad25b19455e529f5ee",
535535
"is_verified": false,
536-
"line_number": 58,
536+
"line_number": 57,
537537
"type": "Secret Keyword",
538538
"verified_result": null
539539
}

SoftLayer/fixtures/SoftLayer_Search.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,4 @@
8282
},
8383
"resourceType": "SoftLayer_Network_Vlan"
8484
}
85-
]
85+
]

tests/CLI/helper_tests.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,3 @@ def test_export_to_template(self):
448448
self.assertEqual(len(data.splitlines()), 2)
449449
self.assertIn('datacenter=ams01\n', data)
450450
self.assertIn('disk=disk1,disk2\n', data)
451-
452-
453-

tests/CLI/modules/hardware/hardware_basic_tests.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
from SoftLayer.CLI import exceptions
1717
from SoftLayer.fixtures import SoftLayer_Product_Order
18-
from SoftLayer.fixtures import SoftLayer_Search
1918
from SoftLayer import SoftLayerError
2019
from SoftLayer import testing
2120
from SoftLayer import utils
@@ -1031,4 +1030,3 @@ def test_hardware_cancel_no_force(self, confirm_mock):
10311030

10321031
self.assertEqual(2, result.exit_code)
10331032
self.assertEqual('Aborted', result.exception.message)
1034-

tests/CLI/modules/hardware/hardware_vlan_tests.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,10 @@
88
"""
99

1010
import json
11-
import sys
12-
import tempfile
13-
from unittest import mock as mock
1411

15-
from SoftLayer.CLI import exceptions
1612
from SoftLayer.fixtures import SoftLayer_Hardware_Server
1713
from SoftLayer.fixtures import SoftLayer_Search
18-
from SoftLayer import SoftLayerError
1914
from SoftLayer import testing
20-
from SoftLayer import utils
2115

2216

2317
class HardwareVlanCLITests(testing.TestCase):
@@ -36,7 +30,7 @@ def test_hardware_vlan_trunkable_happypath(self):
3630
{
3731
'maxSpeed': 1000,
3832
'networkVlansTrunkable': [{
39-
'id':5555,
33+
'id': 5555,
4034
'fullyQualifiedName': 'test01.ibm99.1234',
4135
'name': 'IBMTEst',
4236
'networkSpace': 'PUBLIC'
@@ -67,7 +61,6 @@ def test_hardware_vlan_trunkable_no_vlans_json(self):
6761
self.assert_no_fail(result)
6862
self.assertEqual([], output)
6963

70-
7164
# slcli hardware vlan-remove
7265
def test_hardware_vlan_remove(self):
7366
mock = self.set_mock('SoftLayer_Search', 'advancedSearch')
@@ -97,7 +90,6 @@ def test_hardware_vlan_remove_no_vlans(self):
9790
self.assertEqual("Argument Error: Error: Missing argument 'VLANS'.", result.exception.message)
9891

9992
def test_hardware_vlan_remove_all_vlans(self):
100-
from pprint import pprint as pp
10193
mock = self.set_mock('SoftLayer_Search', 'advancedSearch')
10294
mock.return_value = SoftLayer_Search.advancedSearchVlan
10395
hardware_mock = self.set_mock('SoftLayer_Hardware_Server', 'getObject')
@@ -139,4 +131,4 @@ def test_hardware_vlan_add_no_vlans(self):
139131
mock.return_value = SoftLayer_Search.advancedSearchVlan
140132
result = self.run_command(['hardware', 'vlan-add', '12345'])
141133
self.assertEqual(2, result.exit_code)
142-
self.assertEqual("Argument Error: Error: Missing argument 'VLANS'.", result.exception.message)
134+
self.assertEqual("Argument Error: Error: Missing argument 'VLANS'.", result.exception.message)

0 commit comments

Comments
 (0)