diff --git a/doc/source/ostestr.rst b/doc/source/ostestr.rst index 9bfdd87..7e1766a 100644 --- a/doc/source/ostestr.rst +++ b/doc/source/ostestr.rst @@ -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 diff --git a/os_testr/ostestr.py b/os_testr/ostestr.py index 0af3832..990f088 100755 --- a/os_testr/ostestr.py +++ b/os_testr/ostestr.py @@ -60,8 +60,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() diff --git a/os_testr/testlist_builder.py b/os_testr/testlist_builder.py index 4a8175f..649d2c7 100644 --- a/os_testr/testlist_builder.py +++ b/os_testr/testlist_builder.py @@ -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) diff --git a/os_testr/tests/testlist_builder.py b/os_testr/tests/testlist_builder.py index 30fbabe..9a99d19 100644 --- a/os_testr/tests/testlist_builder.py +++ b/os_testr/tests/testlist_builder.py @@ -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)