Skip to content

Commit dec6321

Browse files
committed
Reformat due to black issues
1 parent cb4cd17 commit dec6321

4 files changed

Lines changed: 40 additions & 26 deletions

File tree

tests/integration/linodes/helpers.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
)
99

1010
DEFAULT_RANDOM_PASS = exec_test_command(["openssl", "rand", "-base64", "32"])
11-
DEFAULT_REGION = "pl-labkrk-2" if "devcloud" in os.getenv('LINODE_CLI_API_HOST') else "us-ord"
11+
DEFAULT_REGION = (
12+
"pl-labkrk-2"
13+
if "devcloud" in os.getenv("LINODE_CLI_API_HOST")
14+
else "us-ord"
15+
)
1216

1317
DEFAULT_TEST_IMAGE = exec_test_command(
1418
[

tests/integration/networking/fixtures.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def create_reserved_ip(request):
2121
DEFAULT_REGION,
2222
"--text",
2323
"--delimiter",
24-
","
24+
",",
2525
]
2626

2727
if tags:
@@ -66,4 +66,4 @@ def get_command_heads_and_vals(command):
6666
headers = [item for item in result[0].split(",")]
6767
values = [item for item in result[1].split(",")]
6868

69-
return headers, values
69+
return headers, values

tests/integration/networking/test_networking.py

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,13 @@
1919
)
2020

2121
RESERVED_IP_HEADERS = [
22-
"address", "type", "public", "rdns", "linode_id", "reserved", "tags"
22+
"address",
23+
"type",
24+
"public",
25+
"rdns",
26+
"linode_id",
27+
"reserved",
28+
"tags",
2329
]
2430

2531

@@ -137,28 +143,26 @@ def test_allocate_additional_private_ipv4_address(test_linode_id):
137143
"ipv4,False,.*,[0-9][0-9][0-9][0-9][0-9][0-9][0-9]*", result
138144
)
139145

146+
140147
@pytest.mark.smoke
141-
@pytest.mark.parametrize(
142-
"create_reserved_ip", ["test", None], indirect=True
143-
)
148+
@pytest.mark.parametrize("create_reserved_ip", ["test", None], indirect=True)
144149
def test_create_reserved_ip(create_reserved_ip):
145150
headers, reserved_ip = create_reserved_ip
146151
assert_headers_in_lines(RESERVED_IP_HEADERS, [headers])
147152
verify_reserved_ip(reserved_ip)
148153

149154
tags = reserved_ip[-1]
150-
assert tags == "test" if tags else tags == ''
155+
assert tags == "test" if tags else tags == ""
151156

152157

153-
@pytest.mark.parametrize(
154-
"create_reserved_ip", ["test"], indirect=True
155-
)
158+
@pytest.mark.parametrize("create_reserved_ip", ["test"], indirect=True)
156159
def test_update_reserved_ip_tags(create_reserved_ip):
157160
_, reserved_ip = create_reserved_ip
158161
assert reserved_ip[-1] == "test"
159162

160-
result = exec_test_command(
161-
BASE_CMDS["networking"] + [
163+
result = exec_test_command(
164+
BASE_CMDS["networking"]
165+
+ [
162166
"reserved-ip-update",
163167
"--tags",
164168
"updated",
@@ -168,7 +172,7 @@ def test_update_reserved_ip_tags(create_reserved_ip):
168172
"--text",
169173
"--no-headers",
170174
"--delimiter",
171-
","
175+
",",
172176
]
173177
).split(",")
174178
verify_reserved_ip(result)
@@ -180,7 +184,8 @@ def test_create_reserved_ip_assigned(create_reserved_ip, test_linode_id):
180184
linode_id = test_linode_id
181185

182186
exec_test_command(
183-
BASE_CMDS["networking"] + [
187+
BASE_CMDS["networking"]
188+
+ [
184189
"ip-assign",
185190
"--assignments.linode_id",
186191
linode_id,
@@ -197,7 +202,7 @@ def test_create_reserved_ip_assigned(create_reserved_ip, test_linode_id):
197202
reserved_ip[0],
198203
"--text",
199204
"--delimiter",
200-
","
205+
",",
201206
]
202207
headers, values = get_command_heads_and_vals(command)
203208

@@ -215,7 +220,7 @@ def test_get_reserved_ip_types():
215220
"reserved-ip-types-list",
216221
"--text",
217222
"--delimiter",
218-
","
223+
",",
219224
]
220225
headers, values = get_command_heads_and_vals(command)
221226

@@ -232,7 +237,7 @@ def test_get_reserved_ip_view(create_reserved_ip):
232237
reserved_ip[0],
233238
"--text",
234239
"--delimiter",
235-
","
240+
",",
236241
]
237242
headers, values = get_command_heads_and_vals(command)
238243

@@ -242,12 +247,13 @@ def test_get_reserved_ip_view(create_reserved_ip):
242247

243248
def test_get_reserved_ips_list(create_reserved_ip):
244249
result = exec_test_command(
245-
BASE_CMDS["networking"] + [
250+
BASE_CMDS["networking"]
251+
+ [
246252
"reserved-ips-list",
247253
"--text",
248254
"--no-headers",
249255
"--format",
250-
"reserved"
256+
"reserved",
251257
]
252258
).splitlines()
253259

@@ -258,7 +264,8 @@ def test_update_ephemeral_to_reserved(test_linode_id):
258264
linode_id = test_linode_id
259265

260266
ephemeral_ip = exec_test_command(
261-
BASE_CMDS["linodes"] + [
267+
BASE_CMDS["linodes"]
268+
+ [
262269
"view",
263270
linode_id,
264271
"--text",
@@ -269,7 +276,8 @@ def test_update_ephemeral_to_reserved(test_linode_id):
269276
).split(" ")[0]
270277

271278
exec_test_command(
272-
BASE_CMDS["networking"] + [
279+
BASE_CMDS["networking"]
280+
+ [
273281
"ip-update",
274282
ephemeral_ip,
275283
"--reserved",
@@ -278,7 +286,8 @@ def test_update_ephemeral_to_reserved(test_linode_id):
278286
)
279287

280288
is_reserved = exec_test_command(
281-
BASE_CMDS["networking"] + [
289+
BASE_CMDS["networking"]
290+
+ [
282291
"reserved-ip-view",
283292
ephemeral_ip,
284293
"--text",

tests/integration/tags/test_tags.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,19 @@ def test_create_tag_for_reserved_ip(create_reserved_ip):
5858
"--label",
5959
tag_name,
6060
"--reserved_ipv4_addresses",
61-
reserved_ip[0]
61+
reserved_ip[0],
6262
]
6363
)
6464

6565
result = exec_test_command(
66-
BASE_CMDS["networking"] + [
66+
BASE_CMDS["networking"]
67+
+ [
6768
"reserved-ip-view",
6869
reserved_ip[0],
6970
"--text",
7071
"--no-headers",
7172
"--format",
72-
"tags"
73+
"tags",
7374
]
7475
)
7576

0 commit comments

Comments
 (0)