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

Jump to bottom

tools: expose skip output to test runner #2130

Closed
wants to merge 7 commits into from
Closed

tools: expose skip output to test runner #2130

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ea2fa68
tools: expose skip output to test runner
jbergstroem Jul 8, 2015
b673537
fix: use regex instead of string matching
jbergstroem Jul 8, 2015
de4e4d0
fix: avoid calling strip
jbergstroem Jul 8, 2015
3014572
fix: use raw text and compile regex
jbergstroem Jul 8, 2015
4d6b0b5
fix: use 'official' regex and rename var
jbergstroem Jul 8, 2015
9cd5da6
fix: switch to re.search
jbergstroem Jul 8, 2015
3749544
fix: simplify logic by avoiding classes
jbergstroem Jul 13, 2015
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
8 changes: 8 additions & 0 deletions tools/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
from Queue import Queue, Empty

logger = logging.getLogger('testrunner')
is_skipped = re.compile(r"# SKIP\S+ (.+)", re.IGNORECASE)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you use single quotes? By the way, the "official" regular expression is # SKIP\S*\s+(.*).


VERBOSE = False

Expand Down Expand Up @@ -255,6 +256,9 @@ def HasRun(self, output):
logger.info('#' + l)
for l in output.output.stdout.splitlines():
logger.info('#' + l)
elif output.HasSkipped():
skip = is_skipped.findall(output.output.stdout)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason to use .findall() instead of .search() here? I would just drop HasSkipped() and write it like this:

else:
  match = re.match(r'# SKIP\S*\s+(.*)', output.output.stdout, re.IGNORECASE)
  if match:
    logger.info('ok %i - %s # skip %s' % (self._done, command, match.group(1)))
  else:
    logger.info('ok %i - %s' % (self._done, command))

Minor aside: if you want to keep the regex separate, maybe rename is_skipped to e.g. skip_regex.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bnoordhuis +1. It is Pythonic :-) I would still compile the RegEx with re.compile.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bnoordhuis the reason i went with HasSkipped was just to follow conventions in test.py as close as possible.

logger.info('ok %i - %s # skip %s' % (self._done, command, skip[0]))
else:
logger.info('ok %i - %s' % (self._done, command))

Expand Down Expand Up @@ -471,6 +475,10 @@ def UnexpectedOutput(self):
outcome = PASS
return not outcome in self.test.outcomes

def HasSkipped(self):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: It is not pythonic to have a method name starting with a capital letter.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Followed the conventions already established in test.py. Wasn't very keen on rewriting them all?

skip = is_skipped.search(self.output.stdout)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a question, since I am about to touch this code too, where is the "# SKIP" output generated? Is it logged to stdout by the tests themselves?
There is also support in the test runner to do this with status files.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@orangemocha PTAL at #2109

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the tests print '0..1 # Skipped: <reason>'.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, thanks!

return self.store_unexpected_output and skip

def HasPreciousOutput(self):
return self.UnexpectedOutput() and self.store_unexpected_output

Expand Down