This commit is contained in:
Egor Matveev 2022-02-06 11:06:46 +03:00
parent 0e2e6eea83
commit fe6bf5df43

View File

@ -36,14 +36,14 @@ class BaseTester:
) )
if code != 0: if code != 0:
raise TestException("RE") raise TestException("RE")
result = open(join(self.solution.testing_directory, "output.txt"), "r").read() result = open(join(self.solution.testing_directory, "output.txt"), "r").read().strip().replace('\r\n', '\n')
print("got result", result) print("got result", result)
if exists(f"solutions/{self.solution.id}/checker.sh"): if exists(f"solutions/{self.solution.id}/checker.sh"):
code = self.solution.exec_command(f"./checker.sh --expected {self.predicted} --output {result}") code = self.solution.exec_command(f"./checker.sh --expected {self.predicted} --output {result}")
if code != 0: if code != 0:
raise TestException("WA") raise TestException("WA")
else: else:
if result.strip().replace('\r\n', '\n') != self.predicted.strip().replace('\r\n', '\n'): if result != self.predicted:
raise TestException("WA") raise TestException("WA")
def after_test(self): def after_test(self):
@ -99,8 +99,8 @@ class BaseTester:
if not test.filename.endswith(".a"): if not test.filename.endswith(".a"):
self.predicted = ExtraFile.objects.get( self.predicted = ExtraFile.objects.get(
task=self.solution.task, filename=test.filename + ".a" task=self.solution.task, filename=test.filename + ".a"
).text ).text.strip().replace('\r\n', '\n')
print('presicted:', self.predicted) print('predicted:', self.predicted)
self.solution.test = int(test.filename) self.solution.test = int(test.filename)
self.solution.save() self.solution.save()
self.test(test.filename) self.test(test.filename)