openstack/os-testr
Code Issues Proposed changes

Fix typo and change regexp to regex

Browse Source 
This commit fixes some typos and changes 'regexp' to 'regex'. I think
'regexp' is also correct. However, in ostestr, they are mixed. So users
may be confused with it. So let's fix it.

Change-Id: I6c9042527707315f5dbb56f4a406327668c57d04
This commit is contained in:
Masayuki Igawa 2016-12-02 17:11:24 +09:00
parent 0de62e38e6
commit ac8fb7ca90
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/source/ostestr.rst
View File

@ -122,13 +122,13 @@ This will do a straight passthrough of the provided regex to testr.
When ostestr is asked to do more complex test selection than a sinlge regex,
it will ask testr for a full list of tests than passing the filtered test list
back to testr.
ostestr allows you do to do simple test exclusion via apssing rejection/black regexp::
ostestr allows you do to do simple test exclusion via apssing rejection/black regex::
$ ostestr --back-regex 'slow_tests|bad_tests'
$ ostestr --black-regex 'slow_tests|bad_tests'
ostestr also allow you to combine these argumants::
$ ostestr --regex ui\.interface --back-regexp 'slow_tests|bad_tests'
$ ostestr --regex ui\.interface --black-regex 'slow_tests|bad_tests'
Here first we selected all tests which matches to 'ui\.interface',
than we are dropping all test which matches
@ -147,7 +147,7 @@ start of a comment on a line. For example::
^regex1 # Excludes these tests
.*regex2 # exclude those tests
The regexp used in the blacklist File or passed as argument, will be used
The regex used in the blacklist File or passed as argument, will be used
to drop tests from the initial selection list.
Will generate a list which will exclude both any tests
matching '^regex1' and '.*regex2'. If a blacklist file is used in conjunction

4
os_testr/ostestr.py
View File

@ -58,8 +58,8 @@ def get_parser(args):
help='Test rejection regex. If a test cases name '
'matches on re.search() operation , '
'it will be removed from the final test list. '
'Effectively the black-regexp is added to '
' black regexp list, but you do need to edit a file. '
'Effectively the black-regex is added to '
' black regex list, but you do need to edit a file. '
'The black filtering happens after the initial '
' white selection, which by default is everything.')
pretty = parser.add_mutually_exclusive_group()

2
os_testr/testlist_builder.py
View File

@ -70,7 +70,7 @@ def construct_list(blacklist_file, whitelist_file, regex, black_regex,
black_data = None
if black_regex:
msg = "Skipped bacuse of regexp provided as a command line argument:"
msg = "Skipped because of regex provided as a command line argument:"
record = (re.compile(black_regex), msg, [])
if black_data:
black_data.append(record)

2
os_testr/tests/testlist_builder.py
View File

@ -38,7 +38,7 @@ class TestBlackReader(base.TestCase):
self.assertEqual(r[2], [])
if r[1] == 'note':
note_cnt += 1
self.assertIn('search', dir(r[0])) # like a compiled regexp
self.assertIn('search', dir(r[0])) # like a compiled regex
self.assertEqual(note_cnt, 4)