particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't use capture_output=True with subprocess.run()

Browse source 
The `capture_output` argument does not exist on Python 3.6 used by
default on RHEL-8.

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2023-04-25 12:09:39 +02:00 • committed by Tomáš Hozza
parent 1eb71723a0
commit eb427e2513
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/run/test_mount.py
View file

@ -163,7 +163,7 @@ def test_all_options(tmpdir):
assert st.st_gid == 0
shortname_tested = False
proc = subprocess.run("mount", capture_output=True, check=True)
proc = subprocess.run("mount", stdout=subprocess.PIPE, check=True)
for line in proc.stdout.splitlines():
strline = line.decode("utf-8")
if mountpoint in strline:

4
test/run/test_stages.py
View file

@ -325,7 +325,7 @@ class TestStages(test.TestBase):
qemu_img_run = subprocess.run(
["qemu-img", "info", "--output=json", ip],
capture_output=True,
stdout=subprocess.PIPE,
check=True,
encoding="utf8"
)
@ -490,7 +490,7 @@ class TestStages(test.TestBase):
assert ovf_tree_file.attrib["{http://schemas.dmtf.org/ovf/envelope/1}size"] == str(os.stat(vmdk).st_size)
ovf_tree_disk = ovf_tree_root[1][1]
res = subprocess.run(["qemu-img", "info", "--output=json", vmdk], check=True, capture_output=True)
res = subprocess.run(["qemu-img", "info", "--output=json", vmdk], check=True, stdout=subprocess.PIPE)
capacity = ovf_tree_disk.attrib["{http://schemas.dmtf.org/ovf/envelope/1}capacity"]
assert capacity == str(json.loads(res.stdout)["virtual-size"])
pop_size = ovf_tree_disk.attrib["{http://schemas.dmtf.org/ovf/envelope/1}populatedSize"]

2
tools/osbuild-mpp
View file

@ -360,7 +360,7 @@ class ImageManifest:
src = f"docker://{imagename}"
res = subprocess.run(["skopeo", "inspect", "--raw", src],
capture_output=True,
stdout=subprocess.PIPE,
check=True)
m = ImageManifest(res.stdout)
m.name = imagename