Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adds .data, fixes --checkdir #74

Merged
merged 12 commits into from
Sep 29, 2017
Merged

adds .data, fixes --checkdir #74

Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9285b53
Fixed EOF messages
cmlsharp Sep 11, 2017
246cc06
Add segfault detection, bugfixes
cmlsharp Sep 20, 2017
8d9182e
Update running checks message
brianyu28 Sep 27, 2017
052d3f8
Fix checkdir bug
brianyu28 Sep 28, 2017
50be7f0
Merge branch 'develop' into bugfixes
dmalan Sep 29, 2017
164be7d
Merge pull request #70 from cs50/bugfixes
dmalan Sep 29, 2017
b55734c
ups version
dmalan Sep 29, 2017
4c54a16
Merge pull request #69 from cs50/eof_output
dmalan Sep 29, 2017
a584bb4
Added SIGINT handler
cmlsharp Sep 29, 2017
4310bd8
Use submit50 handler when possible
cmlsharp Sep 29, 2017
3321978
Merge pull request #75 from cs50/sigint
dmalan Sep 29, 2017
4a9128a
corrected version
dmalan Sep 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions check50.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,14 +473,15 @@ def stdout(self, output=None, str_output=None, timeout=1):
else:
expect = self.child.expect_exact

if str_output is None:
str_output = output

if output == EOF:
str_output = "EOF"
self.test.log.append("checking for EOF...")
else:
if str_output is None:
str_output = output
output = output.replace("\n", "\r\n")
self.test.log.append("checking for output \"{}\"...".format(str_output))

self.test.log.append("checking for output \"{}\"...".format(str_output))

try:
expect(output, timeout=timeout)
Expand All @@ -490,7 +491,7 @@ def stdout(self, output=None, str_output=None, timeout=1):
result += self.child.after
raise Error(Mismatch(str_output, result.replace("\r\n", "\n")))
except TIMEOUT:
raise Error("did not find output {}".format(Mismatch.raw(str_output)))
raise Error("did not find {}".format(Mismatch.raw(str_output)))
except UnicodeDecodeError:
raise Error("output not valid ASCII text")
except Exception:
Expand Down