Skip to content

Commit fcf2d41

Browse files
committed
chore: fix formatting errors
Signed-off-by: Kanishk Pachauri <[email protected]>
1 parent 5a205b9 commit fcf2d41

File tree

2 files changed

+37
-93
lines changed

2 files changed

+37
-93
lines changed

podman/domain/containers_create.py

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -422,9 +422,7 @@ def _convert_env_list_to_dict(env_list):
422422

423423
# Validate key is not empty
424424
if not key.strip():
425-
raise ValueError(
426-
f"Environment variable at index {i} has empty key: '{env_var}'"
427-
)
425+
raise ValueError(f"Environment variable at index {i} has empty key: '{env_var}'")
428426

429427
env_dict[key] = value
430428
return env_dict
@@ -554,9 +552,7 @@ def to_bytes(size: Union[int, str, None]) -> Union[int, None]:
554552
"cni_networks": [pop("network")],
555553
"command": args.pop("command", args.pop("cmd", None)),
556554
"conmon_pid_file": pop("conmon_pid_file"), # TODO document, podman only
557-
"containerCreateCommand": pop(
558-
"containerCreateCommand"
559-
), # TODO document, podman only
555+
"containerCreateCommand": pop("containerCreateCommand"), # TODO document, podman only
560556
"devices": [],
561557
"dns_option": pop("dns_opt"),
562558
"dns_search": pop("dns_search"),
@@ -605,9 +601,7 @@ def to_bytes(size: Union[int, str, None]) -> Union[int, None]:
605601
"rootfs_propagation": pop("rootfs_propagation"),
606602
"sdnotifyMode": pop("sdnotifyMode"), # TODO document, podman only
607603
"seccomp_policy": pop("seccomp_policy"), # TODO document, podman only
608-
"seccomp_profile_path": pop(
609-
"seccomp_profile_path"
610-
), # TODO document, podman only
604+
"seccomp_profile_path": pop("seccomp_profile_path"), # TODO document, podman only
611605
"secrets": [], # TODO document, podman only
612606
"selinux_opts": pop("security_opt"),
613607
"shm_size": to_bytes(pop("shm_size")),
@@ -623,9 +617,7 @@ def to_bytes(size: Union[int, str, None]) -> Union[int, None]:
623617
"unified": pop("unified"), # TODO document, podman only
624618
"unmask": pop("unmasked_paths"), # TODO document, podman only
625619
"use_image_hosts": pop("use_image_hosts"), # TODO document, podman only
626-
"use_image_resolve_conf": pop(
627-
"use_image_resolve_conf"
628-
), # TODO document, podman only
620+
"use_image_resolve_conf": pop("use_image_resolve_conf"), # TODO document, podman only
629621
"user": pop("user"),
630622
"version": pop("version"),
631623
"volumes": [],
@@ -647,15 +639,9 @@ def to_bytes(size: Union[int, str, None]) -> Union[int, None]:
647639
params["log_configuration"]["driver"] = args["log_config"].get("Type")
648640

649641
if "Config" in args["log_config"]:
650-
params["log_configuration"]["path"] = args["log_config"]["Config"].get(
651-
"path"
652-
)
653-
params["log_configuration"]["size"] = args["log_config"]["Config"].get(
654-
"size"
655-
)
656-
params["log_configuration"]["options"] = args["log_config"][
657-
"Config"
658-
].get("options")
642+
params["log_configuration"]["path"] = args["log_config"]["Config"].get("path")
643+
params["log_configuration"]["size"] = args["log_config"]["Config"].get("size")
644+
params["log_configuration"]["options"] = args["log_config"]["Config"].get("options")
659645
args.pop("log_config")
660646

661647
for item in args.pop("mounts", []):
@@ -710,9 +696,7 @@ def parse_host_port(_container_port, _protocol, _host):
710696
result.append(port_map)
711697
elif isinstance(_host, list):
712698
for host_list in _host:
713-
host_list_result = parse_host_port(
714-
_container_port, _protocol, host_list
715-
)
699+
host_list_result = parse_host_port(_container_port, _protocol, host_list)
716700
result.extend(host_list_result)
717701
elif isinstance(_host, dict):
718702
_host_port = _host.get("port")
@@ -854,8 +838,7 @@ def parse_host_port(_container_port, _protocol, _host):
854838

855839
if len(args) > 0:
856840
raise TypeError(
857-
"Unknown keyword argument(s): "
858-
+ " ,".join(f"'{k}'" for k in args.keys())
841+
"Unknown keyword argument(s): " + " ,".join(f"'{k}'" for k in args.keys())
859842
)
860843

861844
return params

podman/tests/unit/test_containersmanager.py

Lines changed: 28 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -260,9 +260,9 @@ def test_create_parse_host_port(self, mock):
260260
"protocol": "tcp",
261261
},
262262
]
263-
actual_ports = json.loads(
264-
self.client.containers.client.post.call_args[1]["data"]
265-
)["portmappings"]
263+
actual_ports = json.loads(self.client.containers.client.post.call_args[1]["data"])[
264+
"portmappings"
265+
]
266266
self.assertEqual(expected_ports, actual_ports)
267267

268268
@requests_mock.Mocker()
@@ -284,9 +284,9 @@ def test_create_userns_mode_simple(self, mock):
284284
self.client.containers.client.post.assert_called()
285285
expected_userns = {"nsmode": userns}
286286

287-
actual_userns = json.loads(
288-
self.client.containers.client.post.call_args[1]["data"]
289-
)["userns"]
287+
actual_userns = json.loads(self.client.containers.client.post.call_args[1]["data"])[
288+
"userns"
289+
]
290290
self.assertEqual(expected_userns, actual_userns)
291291

292292
@requests_mock.Mocker()
@@ -308,9 +308,9 @@ def test_create_userns_mode_dict(self, mock):
308308
self.client.containers.client.post.assert_called()
309309
expected_userns = dict(**userns)
310310

311-
actual_userns = json.loads(
312-
self.client.containers.client.post.call_args[1]["data"]
313-
)["userns"]
311+
actual_userns = json.loads(self.client.containers.client.post.call_args[1]["data"])[
312+
"userns"
313+
]
314314
self.assertEqual(expected_userns, actual_userns)
315315

316316
def test_create_unsupported_key(self):
@@ -323,13 +323,10 @@ def test_create_unknown_key(self):
323323

324324
@requests_mock.Mocker()
325325
def test_create_convert_env_list_to_dict(self, mock):
326-
327326
env_list1 = ["FOO=foo", "BAR=bar"]
328327
# Test valid list
329328
converted_dict1 = {"FOO": "foo", "BAR": "bar"}
330-
self.assertEqual(
331-
CreateMixin._convert_env_list_to_dict(env_list1), converted_dict1
332-
)
329+
self.assertEqual(CreateMixin._convert_env_list_to_dict(env_list1), converted_dict1)
333330

334331
# Test empty string
335332
env_list2 = ["FOO=foo", ""]
@@ -346,51 +343,37 @@ def test_create_convert_env_list_to_dict(self, mock):
346343
# Test empty list
347344
env_list5 = []
348345
converted_dict5 = {}
349-
self.assertEqual(
350-
CreateMixin._convert_env_list_to_dict(env_list5), converted_dict5
351-
)
346+
self.assertEqual(CreateMixin._convert_env_list_to_dict(env_list5), converted_dict5)
352347

353348
# Test single valid environment variable
354349
env_list6 = ["SINGLE=value"]
355350
converted_dict6 = {"SINGLE": "value"}
356-
self.assertEqual(
357-
CreateMixin._convert_env_list_to_dict(env_list6), converted_dict6
358-
)
351+
self.assertEqual(CreateMixin._convert_env_list_to_dict(env_list6), converted_dict6)
359352

360353
# Test environment variable with empty value
361354
env_list7 = ["EMPTY="]
362355
converted_dict7 = {"EMPTY": ""}
363-
self.assertEqual(
364-
CreateMixin._convert_env_list_to_dict(env_list7), converted_dict7
365-
)
356+
self.assertEqual(CreateMixin._convert_env_list_to_dict(env_list7), converted_dict7)
366357

367358
# Test environment variable with multiple equals signs
368359
env_list8 = ["URL=https://example.com/path?param=value"]
369360
converted_dict8 = {"URL": "https://example.com/path?param=value"}
370-
self.assertEqual(
371-
CreateMixin._convert_env_list_to_dict(env_list8), converted_dict8
372-
)
361+
self.assertEqual(CreateMixin._convert_env_list_to_dict(env_list8), converted_dict8)
373362

374363
# Test environment variable with spaces in value
375364
env_list9 = ["MESSAGE=Hello World", "PATH=/usr/local/bin:/usr/bin"]
376365
converted_dict9 = {"MESSAGE": "Hello World", "PATH": "/usr/local/bin:/usr/bin"}
377-
self.assertEqual(
378-
CreateMixin._convert_env_list_to_dict(env_list9), converted_dict9
379-
)
366+
self.assertEqual(CreateMixin._convert_env_list_to_dict(env_list9), converted_dict9)
380367

381368
# Test environment variable with special characters
382369
env_list10 = ["SPECIAL=!@#$%^&*()_+-=[]{}|;':\",./<>?"]
383370
converted_dict10 = {"SPECIAL": "!@#$%^&*()_+-=[]{}|;':\",./<>?"}
384-
self.assertEqual(
385-
CreateMixin._convert_env_list_to_dict(env_list10), converted_dict10
386-
)
371+
self.assertEqual(CreateMixin._convert_env_list_to_dict(env_list10), converted_dict10)
387372

388373
# Test environment variable with numeric values
389374
env_list11 = ["PORT=8080", "TIMEOUT=30"]
390375
converted_dict11 = {"PORT": "8080", "TIMEOUT": "30"}
391-
self.assertEqual(
392-
CreateMixin._convert_env_list_to_dict(env_list11), converted_dict11
393-
)
376+
self.assertEqual(CreateMixin._convert_env_list_to_dict(env_list11), converted_dict11)
394377

395378
# Test environment variable with boolean-like values
396379
env_list12 = ["DEBUG=true", "VERBOSE=false", "ENABLED=1", "DISABLED=0"]
@@ -400,16 +383,12 @@ def test_create_convert_env_list_to_dict(self, mock):
400383
"ENABLED": "1",
401384
"DISABLED": "0",
402385
}
403-
self.assertEqual(
404-
CreateMixin._convert_env_list_to_dict(env_list12), converted_dict12
405-
)
386+
self.assertEqual(CreateMixin._convert_env_list_to_dict(env_list12), converted_dict12)
406387

407388
# Test environment variable with whitespace in key (should preserve)
408389
env_list13 = [" SPACED_KEY =value", "KEY= spaced_value "]
409390
converted_dict13 = {" SPACED_KEY ": "value", "KEY": " spaced_value "}
410-
self.assertEqual(
411-
CreateMixin._convert_env_list_to_dict(env_list13), converted_dict13
412-
)
391+
self.assertEqual(CreateMixin._convert_env_list_to_dict(env_list13), converted_dict13)
413392

414393
# Test missing equals sign
415394
env_list14 = ["FOO=foo", "INVALID"]
@@ -440,38 +419,28 @@ def test_create_convert_env_list_to_dict(self, mock):
440419
# Test duplicate keys (last one should win)
441420
env_list21 = ["KEY=first", "KEY=second", "OTHER=value"]
442421
converted_dict21 = {"KEY": "second", "OTHER": "value"}
443-
self.assertEqual(
444-
CreateMixin._convert_env_list_to_dict(env_list21), converted_dict21
445-
)
422+
self.assertEqual(CreateMixin._convert_env_list_to_dict(env_list21), converted_dict21)
446423

447424
# Test very long environment variable
448425
long_value = "x" * 1000
449426
env_list22 = [f"LONG_VAR={long_value}"]
450427
converted_dict22 = {"LONG_VAR": long_value}
451-
self.assertEqual(
452-
CreateMixin._convert_env_list_to_dict(env_list22), converted_dict22
453-
)
428+
self.assertEqual(CreateMixin._convert_env_list_to_dict(env_list22), converted_dict22)
454429

455430
# Test environment variable with newlines and tabs
456431
env_list23 = ["MULTILINE=line1\nline2\ttabbed"]
457432
converted_dict23 = {"MULTILINE": "line1\nline2\ttabbed"}
458-
self.assertEqual(
459-
CreateMixin._convert_env_list_to_dict(env_list23), converted_dict23
460-
)
433+
self.assertEqual(CreateMixin._convert_env_list_to_dict(env_list23), converted_dict23)
461434

462435
# Test environment variable with unicode characters
463436
env_list24 = ["UNICODE=こんにちは", "EMOJI=🚀🌟"]
464437
converted_dict24 = {"UNICODE": "こんにちは", "EMOJI": "🚀🌟"}
465-
self.assertEqual(
466-
CreateMixin._convert_env_list_to_dict(env_list24), converted_dict24
467-
)
438+
self.assertEqual(CreateMixin._convert_env_list_to_dict(env_list24), converted_dict24)
468439

469440
# Test case sensitivity
470441
env_list25 = ["path=/usr/bin", "PATH=/usr/local/bin"]
471442
converted_dict25 = {"path": "/usr/bin", "PATH": "/usr/local/bin"}
472-
self.assertEqual(
473-
CreateMixin._convert_env_list_to_dict(env_list25), converted_dict25
474-
)
443+
self.assertEqual(CreateMixin._convert_env_list_to_dict(env_list25), converted_dict25)
475444

476445
@requests_mock.Mocker()
477446
def test_run_detached(self, mock):
@@ -494,9 +463,7 @@ def test_run_detached(self, mock):
494463
json=FIRST_CONTAINER,
495464
)
496465

497-
with patch.multiple(
498-
Container, logs=DEFAULT, wait=DEFAULT, autospec=True
499-
) as mock_container:
466+
with patch.multiple(Container, logs=DEFAULT, wait=DEFAULT, autospec=True) as mock_container:
500467
mock_container["logs"].return_value = []
501468
mock_container["wait"].return_value = {"StatusCode": 0}
502469

@@ -529,27 +496,21 @@ def test_run(self, mock):
529496
b"This is a unittest - line 2",
530497
)
531498

532-
with patch.multiple(
533-
Container, logs=DEFAULT, wait=DEFAULT, autospec=True
534-
) as mock_container:
499+
with patch.multiple(Container, logs=DEFAULT, wait=DEFAULT, autospec=True) as mock_container:
535500
mock_container["wait"].return_value = 0
536501

537502
with self.subTest("Results not streamed"):
538503
mock_container["logs"].return_value = iter(mock_logs)
539504

540505
actual = self.client.containers.run("fedora", "/usr/bin/ls")
541506
self.assertIsInstance(actual, bytes)
542-
self.assertEqual(
543-
actual, b"This is a unittest - line 1This is a unittest - line 2"
544-
)
507+
self.assertEqual(actual, b"This is a unittest - line 1This is a unittest - line 2")
545508

546509
# iter() cannot be reset so subtests used to create new instance
547510
with self.subTest("Stream results"):
548511
mock_container["logs"].return_value = iter(mock_logs)
549512

550-
actual = self.client.containers.run(
551-
"fedora", "/usr/bin/ls", stream=True
552-
)
513+
actual = self.client.containers.run("fedora", "/usr/bin/ls", stream=True)
553514
self.assertNotIsInstance(actual, bytes)
554515
self.assertIsInstance(actual, Iterator)
555516
self.assertEqual(next(actual), b"This is a unittest - line 1")

0 commit comments

Comments
 (0)