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.

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

Resolves Issue (in seash) #99 #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions utf.py
Original file line number Diff line number Diff line change
Expand Up @@ -622,12 +622,12 @@ def verify_results(pragma_type, pragma_dictionary, output, report):
for outline in outlines:
# Are there any wildcards?
# We use '' to indicate wildcards.
while remaining_out_lines and not remaining_out_lines[0]:
while remaining_out_lines and not remaining_out_lines[0]: # <~> This does not make sense to me. We're not actually spending the wildcards this way....
remaining_out_lines = remaining_out_lines[1:]

# Are there remaining expected lines?
if remaining_out_lines and remaining_out_lines[0] in outline:
remaining_out_lines = remaining_out_lines[1:]
remaining_out_lines = remaining_out_lines[1:] # <~> Why aren't we then marking this outline as OK or something?

# Get rid of any remaining wildcards that may still exist
while remaining_out_lines and not remaining_out_lines[0]:
Expand All @@ -645,7 +645,10 @@ def verify_results(pragma_type, pragma_dictionary, output, report):
report[pragma_type] = (out, expected_output)
# If not, make sure the standard out is empty.
elif out:
report[pragma_type] = (out, None)
# Specifically disregard '\x1b[?1034h' here. See issue https://github.com/SeattleTestbed/seash/issues/99#issuecomment-179342305
# Todo: But we haven't covered the case in which there are pragma directives and this escape character precedes them....
if out != '\x1b[?1034h':
report[pragma_type] = (out, None)

def parse_pragma(source_text):
"""
Expand Down