Skip to content

Commit bc95b62

Browse files
committed
Use black on the tests folder
1 parent cc80444 commit bc95b62

File tree

3 files changed

+89
-71
lines changed

3 files changed

+89
-71
lines changed

tests/conftest.py

+11-11
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ def create_ports(tmpdir, monkeypatch):
1717
def _create_ports(ports):
1818
def get_db():
1919
tmp_db = tmpdir.join("db.json")
20-
db = TinyDB(
21-
str(tmp_db),
22-
storage=CachingMiddleware(JSONStorage)
23-
)
20+
db = TinyDB(str(tmp_db), storage=CachingMiddleware(JSONStorage))
2421

2522
for port in ports:
26-
db.insert({
27-
'name': port[0],
28-
'port': port[1],
29-
"description": port[2],
30-
"protocol": port[3]
31-
})
23+
db.insert(
24+
{
25+
"name": port[0],
26+
"port": port[1],
27+
"description": port[2],
28+
"protocol": port[3],
29+
}
30+
)
3231
return db
3332

3433
return monkeypatch.setattr(whatportis.db, "get_database", get_db)
35-
return _create_ports
34+
35+
return _create_ports

tests/test_cli.py

+39-31
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@
66

77
def test_search_with_no_arg(runner):
88
result = runner.invoke(run, [])
9-
regex = re.compile('^Usage:')
9+
regex = re.compile("^Usage:")
1010
assert result.exit_code == 2
1111
assert regex.match(result.output)
1212

1313

1414
def test_search_with_multiple_args(runner):
15-
result = runner.invoke(run, ['foo', 'bar'])
16-
regex = re.compile('^Usage:')
15+
result = runner.invoke(run, ["foo", "bar"])
16+
regex = re.compile("^Usage:")
1717
assert result.exit_code == 2
1818
assert regex.match(result.output)
1919

2020

2121
def test_search_str_port(runner, create_ports):
2222
create_ports([["foo", "1234", "My description", "tcp"]])
23-
result = runner.invoke(run, ['foo'])
23+
result = runner.invoke(run, ["foo"])
2424
assert result.exit_code == 0
2525
assert "foo" in result.output
2626
assert "1234" in result.output
@@ -30,7 +30,7 @@ def test_search_str_port(runner, create_ports):
3030

3131
def test_search_int_port(runner, create_ports):
3232
create_ports([["foo", "1234", "My description", "tcp"]])
33-
result = runner.invoke(run, ['1234'])
33+
result = runner.invoke(run, ["1234"])
3434
assert result.exit_code == 0
3535
assert "foo" in result.output
3636
assert "1234" in result.output
@@ -39,42 +39,50 @@ def test_search_int_port(runner, create_ports):
3939

4040

4141
def test_search_str_like_port(runner, create_ports):
42-
create_ports([
43-
["foo", "1", "My description", "tcp"],
44-
["foobar", "2", "My description", "udp"],
45-
["baz", "3", "My description", "tcp"]
46-
])
47-
48-
result = runner.invoke(run, ['foo', '--like'])
42+
create_ports(
43+
[
44+
["foo", "1", "My description", "tcp"],
45+
["foobar", "2", "My description", "udp"],
46+
["baz", "3", "My description", "tcp"],
47+
]
48+
)
49+
50+
result = runner.invoke(run, ["foo", "--like"])
4951
assert result.exit_code == 0
50-
assert result.output.count('foo') == 2
52+
assert result.output.count("foo") == 2
5153

52-
result = runner.invoke(run, ['bar', '--like'])
54+
result = runner.invoke(run, ["bar", "--like"])
5355
assert result.exit_code == 0
54-
assert result.output.count('bar') == 1
56+
assert result.output.count("bar") == 1
5557

5658

5759
def test_search_int_like_port(runner, create_ports):
58-
create_ports([
59-
["foo", "8", "My description", "tcp"],
60-
["foobar", "9", "My description", "udp"],
61-
["baz", "80", "My description", "tcp"]
62-
])
63-
64-
result = runner.invoke(run, ['8', '--like'])
60+
create_ports(
61+
[
62+
["foo", "8", "My description", "tcp"],
63+
["foobar", "9", "My description", "udp"],
64+
["baz", "80", "My description", "tcp"],
65+
]
66+
)
67+
68+
result = runner.invoke(run, ["8", "--like"])
6569
assert result.exit_code == 0
66-
assert result.output.count('8') == 2
70+
assert result.output.count("8") == 2
6771

6872

6973
def test_search_port_returns_json(runner, create_ports):
7074
create_ports([["foo", "1234", "My description", "tcp"]])
71-
result = runner.invoke(run, ['--json', 'foo'])
75+
result = runner.invoke(run, ["--json", "foo"])
7276

7377
result = json.loads(result.output)
74-
wanted = [{
75-
'description': 'My description',
76-
'name': 'foo',
77-
'port': '1234',
78-
'protocol': 'tcp'
79-
}]
80-
assert sorted(result, key=lambda p: p["name"]) == sorted(wanted, key=lambda p: p["name"])
78+
wanted = [
79+
{
80+
"description": "My description",
81+
"name": "foo",
82+
"port": "1234",
83+
"protocol": "tcp",
84+
}
85+
]
86+
assert sorted(result, key=lambda p: p["name"]) == sorted(
87+
wanted, key=lambda p: p["name"]
88+
)

tests/test_utils.py

+39-29
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,47 @@
22

33

44
def test_merge_protocols_different_ports():
5-
ports = [{
6-
"description": "My description 1",
7-
"name": "MyName 1",
8-
"port": "1234",
9-
"protocol": "udp"
10-
}, {
11-
"description": "My description 2",
12-
"name": "MyName 2",
13-
"port": "5678",
14-
"protocol": "tcp"
15-
}]
5+
ports = [
6+
{
7+
"description": "My description 1",
8+
"name": "MyName 1",
9+
"port": "1234",
10+
"protocol": "udp",
11+
},
12+
{
13+
"description": "My description 2",
14+
"name": "MyName 2",
15+
"port": "5678",
16+
"protocol": "tcp",
17+
},
18+
]
1619
result = merge_protocols(ports)
17-
assert sorted(result, key=lambda p: p["name"]) == sorted(ports, key=lambda p: p["name"])
20+
assert sorted(result, key=lambda p: p["name"]) == sorted(
21+
ports, key=lambda p: p["name"]
22+
)
1823

1924

2025
def test_merge_protocols_same_port():
21-
ports = [{
22-
"description": "My description",
23-
"name": "MyName",
24-
"port": "1234",
25-
"protocol": "udp"
26-
}, {
27-
"description": "My description",
28-
"name": "MyName",
29-
"port": "1234",
30-
"protocol": "tcp"
31-
}]
26+
ports = [
27+
{
28+
"description": "My description",
29+
"name": "MyName",
30+
"port": "1234",
31+
"protocol": "udp",
32+
},
33+
{
34+
"description": "My description",
35+
"name": "MyName",
36+
"port": "1234",
37+
"protocol": "tcp",
38+
},
39+
]
3240
result = merge_protocols(ports)
33-
assert result == [{
34-
"description": "My description",
35-
"name": "MyName",
36-
"port": "1234",
37-
"protocol": "udp, tcp"
38-
}]
41+
assert result == [
42+
{
43+
"description": "My description",
44+
"name": "MyName",
45+
"port": "1234",
46+
"protocol": "udp, tcp",
47+
}
48+
]

0 commit comments

Comments
 (0)