Compare commits

..

2 Commits

Author SHA1 Message Date
f247fb6019
format with black 2023-11-04 17:35:18 -04:00
a8adcab0a1
testr/cli.py: print stderr on Invalid Return 2023-11-03 12:37:03 -04:00
5 changed files with 60 additions and 35 deletions

View File

@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project] [project]
name = "gusty-testr" name = "gusty-testr"
version = "0.0.1" version = "0.0.2"
authors = [ authors = [
{ name="dogeystamp", email="dogeystamp@disroot.org" } { name="dogeystamp", email="dogeystamp@disroot.org" }
] ]

3
testr.py Normal file
View File

@ -0,0 +1,3 @@
from testr.cli import main
main()

View File

@ -3,8 +3,8 @@ from colorama import just_fix_windows_console, Fore, Style
import asyncio import asyncio
from pathlib import Path from pathlib import Path
from testr.file_data import DirectorySuite, ExecutableRunner from .file_data import DirectorySuite, ExecutableRunner
from testr.runner import StatusCode, TestOptions from .runner import StatusCode, TestOptions
import argparse import argparse
@ -18,13 +18,16 @@ async def run_cli():
test_data_group = parser.add_mutually_exclusive_group(required=True) test_data_group = parser.add_mutually_exclusive_group(required=True)
test_data_group.add_argument("--testdir", help="Directory for test cases") test_data_group.add_argument("--testdir", help="Directory for test cases")
test_runner_group.add_argument("--exec", help="Executable to run test cases against") test_runner_group.add_argument(
"--exec", help="Executable to run test cases against"
)
parser.add_argument("--timelim", help="Time limit in seconds", type=float, default=5.0) parser.add_argument(
"--timelim", help="Time limit in seconds", type=float, default=5.0
)
args = parser.parse_args() args = parser.parse_args()
code_styles = { code_styles = {
StatusCode.AC: Fore.GREEN, StatusCode.AC: Fore.GREEN,
StatusCode.WA: Fore.RED, StatusCode.WA: Fore.RED,
@ -39,10 +42,7 @@ async def run_cli():
test_case_count = 0 test_case_count = 0
async for test_case in test_runner.run_test_suite( async for test_case in test_runner.run_test_suite(
test_suite, test_suite, TestOptions(time_limit=args.timelim)
TestOptions(
time_limit=args.timelim
)
): ):
test_case_count += 1 test_case_count += 1
status_counts[test_case.code] += 1 status_counts[test_case.code] += 1
@ -51,6 +51,10 @@ async def run_cli():
f"[ {code_styles.get(test_case.code, '')}{test_case.code.name}{Style.RESET_ALL} ]" f"[ {code_styles.get(test_case.code, '')}{test_case.code.name}{Style.RESET_ALL} ]"
) )
if test_case.code == StatusCode.IR:
print("---\n" + Style.BRIGHT + "Program stderr:" + Style.RESET_ALL)
print("\n".join([f" {line}" for line in test_case.stderr.split("\n")]))
if test_case_count > 15: if test_case_count > 15:
print("\n Summary:\n") print("\n Summary:\n")
@ -67,5 +71,6 @@ async def run_cli():
def main(): def main():
asyncio.run(run_cli()) asyncio.run(run_cli())
if __name__ == "__main__": if __name__ == "__main__":
main() main()

View File

@ -1,5 +1,12 @@
import asyncio import asyncio
from testr.runner import TestData, TestOptions, TestRunner, TestStatus, TestSuite, StatusCode from testr.runner import (
TestData,
TestOptions,
TestRunner,
TestStatus,
TestSuite,
StatusCode,
)
from pathlib import Path from pathlib import Path
@ -43,7 +50,8 @@ class ExecutableRunner(TestRunner):
try: try:
out_stream, err_stream = await asyncio.wait_for( out_stream, err_stream = await asyncio.wait_for(
proc.communicate(input=input_data.encode()), timeout=opts.time_limit) proc.communicate(input=input_data.encode()), timeout=opts.time_limit
)
except TimeoutError: except TimeoutError:
proc.kill() proc.kill()
return TestStatus(code=StatusCode.TLE, stderr="", stdout="", test_data=data) return TestStatus(code=StatusCode.TLE, stderr="", stdout="", test_data=data)
@ -52,7 +60,9 @@ class ExecutableRunner(TestRunner):
stderr: str = err_stream.decode() stderr: str = err_stream.decode()
if proc.returncode != 0: if proc.returncode != 0:
return TestStatus(code=StatusCode.IR, stdout=stdout, stderr=stderr, test_data=data) return TestStatus(
code=StatusCode.IR, stdout=stdout, stderr=stderr, test_data=data
)
correct: bool = await data.validate_output(stdout) correct: bool = await data.validate_output(stdout)
ret_code = StatusCode.AC if correct else StatusCode.WA ret_code = StatusCode.AC if correct else StatusCode.WA
@ -73,8 +83,9 @@ class DirectorySuite(TestSuite):
outp_file = inp_file.with_suffix(".out") outp_file = inp_file.with_suffix(".out")
if not outp_file.is_file(): if not outp_file.is_file():
raise ValueError(f"output file '{outp_file}' is not a valid file") raise ValueError(f"output file '{outp_file}' is not a valid file")
self.test_cases.append(FileData(inp_file, outp_file, name=inp_file.with_suffix("").name)) self.test_cases.append(
FileData(inp_file, outp_file, name=inp_file.with_suffix("").name)
)
def __iter__(self): def __iter__(self):
return self.test_cases.__iter__() return self.test_cases.__iter__()

View File

@ -31,14 +31,16 @@ class TestInput(ABC):
"""Input provider for single test case.""" """Input provider for single test case."""
@abstractmethod @abstractmethod
async def get_input(self) -> str: pass async def get_input(self) -> str:
pass
class TestValidator(ABC): class TestValidator(ABC):
"""Output validator for single test case.""" """Output validator for single test case."""
@abstractmethod @abstractmethod
async def validate_output(self, output: str) -> bool: pass async def validate_output(self, output: str) -> bool:
pass
@dataclass @dataclass
@ -71,7 +73,8 @@ class TestSuite(ABC):
"""Loader for multiple test cases.""" """Loader for multiple test cases."""
@abstractmethod @abstractmethod
def __iter__(self) -> Iterator[TestData]: pass def __iter__(self) -> Iterator[TestData]:
pass
@dataclass @dataclass
@ -92,8 +95,11 @@ class TestRunner(ABC):
"""Runner for test cases.""" """Runner for test cases."""
@abstractmethod @abstractmethod
async def run_test(self, data: TestData, opts: TestOptions) -> TestStatus: pass async def run_test(self, data: TestData, opts: TestOptions) -> TestStatus:
pass
async def run_test_suite(self, data: TestSuite, opts: TestOptions) -> AsyncIterator[TestStatus]: async def run_test_suite(
self, data: TestSuite, opts: TestOptions
) -> AsyncIterator[TestStatus]:
for test_case in data: for test_case in data:
yield await self.run_test(test_case, opts) yield await self.run_test(test_case, opts)