Skip to content

Commit 8e0695f

Browse files
committed
Run black formatting on tests
1 parent 910f409 commit 8e0695f

File tree

3 files changed

+41
-28
lines changed

3 files changed

+41
-28
lines changed

hygiene.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
# Script which autoformats (black) and lints (pylint) code
33
echo "Running black ..."
4-
FORMAT_COMMAND="black --safe --verbose --exclude proto src/cisco_gnmi"
4+
FORMAT_COMMAND="black --safe --verbose --exclude proto src/cisco_gnmi tests/"
55
if black &> /dev/null; then
66
eval $FORMAT_COMMAND
77
elif pipenv run black &> /dev/null; then

tests/test_auth.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@ def test_call():
1010
mock_call = mock.MagicMock(spec=CiscoAuthPlugin.__call__)
1111

1212
instance = CiscoAuthPlugin(username, password)
13-
result = instance.__call__([(username, "testUsr"), (password, "testPass")], CiscoAuthPlugin)
13+
result = instance.__call__(
14+
[(username, "testUsr"), (password, "testPass")], CiscoAuthPlugin
15+
)
1416
mock_call.assert_not_called()

tests/test_util.py

Lines changed: 37 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,92 +9,103 @@ def test_gen_target_netloc_valueerror():
99
with pytest.raises(ValueError):
1010
util.gen_target_netloc("http://www.test.com", "test_prefix://", 8000)
1111

12+
1213
def test_gen_target_netloc_parsed_none():
1314

14-
mock_netloc = '//www.testing.com:8080'
15+
mock_netloc = "//www.testing.com:8080"
1516
mock_parsed_netloc = urlparse(mock_netloc)
1617

1718
result = util.gen_target_netloc("www.testing.com", "http://", 8080)
1819
assert mock_parsed_netloc == result
1920

21+
2022
def test_validate_proto_enum_exception_one():
2123

2224
enum = gnmi_pb2.SubscriptionMode
2325

2426
with pytest.raises(Exception):
25-
util.validate_proto_enum('test', 'INVALID_VALUE', 'test', enum)
27+
util.validate_proto_enum("test", "INVALID_VALUE", "test", enum)
28+
2629

2730
def test_validate_proto_enum_exception_two():
2831

2932
enum = gnmi_pb2.SubscriptionMode
3033
fake_subset = [3]
3134

3235
with pytest.raises(Exception):
33-
util.validate_proto_enum('test', 2, 'test', enum, subset=fake_subset)
36+
util.validate_proto_enum("test", 2, "test", enum, subset=fake_subset)
37+
3438

3539
def test_validate_proto_enum_exception_three():
36-
40+
3741
enum = gnmi_pb2.SubscriptionMode
3842
fake_subset = ["ON_CHANGE", "SAMPLE"]
3943

4044
with pytest.raises(Exception):
41-
util.validate_proto_enum('test', 'TARGET_DEFINED', 'test', enum, subset=fake_subset)
45+
util.validate_proto_enum(
46+
"test", "TARGET_DEFINED", "test", enum, subset=fake_subset
47+
)
48+
4249

4350
def test_validate_proto_enum_element_in_subset_one():
4451

4552
enum = gnmi_pb2.SubscriptionMode
4653
fake_subset = ["ON_CHANGE", "SAMPLE"]
4754

48-
result = util.validate_proto_enum('test', 2, 'test', enum, subset=fake_subset)
55+
result = util.validate_proto_enum("test", 2, "test", enum, subset=fake_subset)
4956
assert 2 == result
5057

58+
5159
def test_validate_proto_enum_element_in_subset_two():
52-
60+
5361
enum = gnmi_pb2.SubscriptionMode
5462
fake_subset = [2, 0]
5563

56-
result = util.validate_proto_enum('test', 'TARGET_DEFINED', 'test', enum, subset=fake_subset)
64+
result = util.validate_proto_enum(
65+
"test", "TARGET_DEFINED", "test", enum, subset=fake_subset
66+
)
5767
assert 0 == result
5868

69+
5970
def test_validate_proto_enum_value_returned_one():
6071

6172
enum = gnmi_pb2.SubscriptionMode
6273

63-
result = util.validate_proto_enum('test', 'ON_CHANGE', 'test', enum)
74+
result = util.validate_proto_enum("test", "ON_CHANGE", "test", enum)
6475
assert 1 == result
6576

77+
6678
def test_validate_proto_enum_value_returned_two():
67-
79+
6880
enum = gnmi_pb2.SubscriptionMode
6981

70-
result = util.validate_proto_enum('test', 1, 'test', enum)
82+
result = util.validate_proto_enum("test", 1, "test", enum)
7183
assert 1 == result
7284

85+
7386
def test_get_cert_from_target():
7487

75-
target_netloc = {
76-
"hostname": "cisco.com",
77-
"port": 443
78-
}
79-
80-
expected_ssl_cert = ssl.get_server_certificate((
81-
target_netloc.get("hostname"),
82-
target_netloc.get("port")
83-
))
84-
85-
expected_ssl_cert.encode('utf-8')
86-
88+
target_netloc = {"hostname": "cisco.com", "port": 443}
89+
90+
expected_ssl_cert = ssl.get_server_certificate(
91+
(target_netloc.get("hostname"), target_netloc.get("port"))
92+
)
93+
94+
expected_ssl_cert.encode("utf-8")
95+
8796
target = util.gen_target_netloc("cisco.com:443")
88-
result = util.get_cert_from_target((target)).decode('utf-8')
97+
result = util.get_cert_from_target((target)).decode("utf-8")
8998

9099
assert expected_ssl_cert == result
91100

101+
92102
def test_get_cn_from_cert_returned_value_invalid_entry(mocker):
93103

94-
mock_cert_parsed = mocker.patch.object(x509, 'load_pem_x509_certificate')
95-
result = util.get_cn_from_cert('INVALID_ENTRY')
104+
mock_cert_parsed = mocker.patch.object(x509, "load_pem_x509_certificate")
105+
result = util.get_cn_from_cert("INVALID_ENTRY")
96106

97107
assert None == result
98108

109+
99110
def test_get_cn_from_cert_returned_value(mocker):
100111
pass

0 commit comments

Comments
 (0)