mirror of https://github.com/Nonannet/copapy.git
check_for_qemu function in tests updated to prevent error in error if qemu is not available
This commit is contained in:
parent
d58a723448
commit
44b215f728
|
|
@ -26,7 +26,7 @@ def run_command(command: list[str]) -> str:
|
||||||
def check_for_qemu() -> bool:
|
def check_for_qemu() -> bool:
|
||||||
command = qemu_command + ['--version']
|
command = qemu_command + ['--version']
|
||||||
try:
|
try:
|
||||||
result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, encoding='utf8', check=False)
|
result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=False)
|
||||||
except Exception:
|
except Exception:
|
||||||
return False
|
return False
|
||||||
return result.returncode == 0
|
return result.returncode == 0
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@ def run_command(command: list[str]) -> str:
|
||||||
def check_for_qemu() -> bool:
|
def check_for_qemu() -> bool:
|
||||||
command = qemu_command + ['--version']
|
command = qemu_command + ['--version']
|
||||||
try:
|
try:
|
||||||
result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, encoding='utf8', check=False)
|
result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=False)
|
||||||
except Exception:
|
except Exception:
|
||||||
return False
|
return False
|
||||||
return result.returncode == 0
|
return result.returncode == 0
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ def run_command(command: list[str]) -> str:
|
||||||
def check_for_qemu() -> bool:
|
def check_for_qemu() -> bool:
|
||||||
command = qemu_command + ['--version']
|
command = qemu_command + ['--version']
|
||||||
try:
|
try:
|
||||||
result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, encoding='utf8', check=False)
|
result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=False)
|
||||||
except:
|
except:
|
||||||
return False
|
return False
|
||||||
return result.returncode == 0
|
return result.returncode == 0
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@ if os.name == 'nt':
|
||||||
else:
|
else:
|
||||||
qemu_command = ['qemu-arm']
|
qemu_command = ['qemu-arm']
|
||||||
|
|
||||||
|
|
||||||
def parse_results(log_text: str) -> dict[int, bytes]:
|
def parse_results(log_text: str) -> dict[int, bytes]:
|
||||||
regex = r"^READ_DATA offs=(\d*) size=(\d*) data=(.*)$"
|
regex = r"^READ_DATA offs=(\d*) size=(\d*) data=(.*)$"
|
||||||
matches = re.finditer(regex, log_text, re.MULTILINE)
|
matches = re.finditer(regex, log_text, re.MULTILINE)
|
||||||
|
|
@ -31,6 +32,7 @@ def parse_results(log_text: str) -> dict[int, bytes]:
|
||||||
|
|
||||||
return var_dict
|
return var_dict
|
||||||
|
|
||||||
|
|
||||||
def run_command(command: list[str]) -> str:
|
def run_command(command: list[str]) -> str:
|
||||||
result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, encoding='utf8', check=False)
|
result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, encoding='utf8', check=False)
|
||||||
assert result.returncode != 11, f"SIGSEGV (segmentation fault)\n -Error occurred: {result.stderr}\n -Output: {result.stdout}"
|
assert result.returncode != 11, f"SIGSEGV (segmentation fault)\n -Error occurred: {result.stderr}\n -Output: {result.stdout}"
|
||||||
|
|
@ -41,7 +43,7 @@ def run_command(command: list[str]) -> str:
|
||||||
def check_for_qemu() -> bool:
|
def check_for_qemu() -> bool:
|
||||||
command = qemu_command + ['--version']
|
command = qemu_command + ['--version']
|
||||||
try:
|
try:
|
||||||
result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, encoding='utf8', check=False)
|
result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=False)
|
||||||
except:
|
except:
|
||||||
return False
|
return False
|
||||||
return result.returncode == 0
|
return result.returncode == 0
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue