Skip to content

Commit 1c4f891

Browse files
authored
Merge branch 'master' into update-badge
2 parents 10f6948 + 9323c95 commit 1c4f891

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

CHANGELOG.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Change Log
1111

1212
.. There should always be an "Unreleased" section for changes pending release.
1313
14-
[0.10.2] - 2020-11-19
14+
[0.10.3] - 2020-12-15
1515
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1616

1717
* Updated the travis-badge in README.rst to point to travis-ci.com

code_annotations/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ def check_results(self, all_results):
480480
found_group_members = []
481481

482482
if current_group:
483-
self.errors.append('File finished with an incomplete group {}!'.format(current_group))
483+
self.errors.append('File("{}") finished with an incomplete group {}!'.format(filename, current_group))
484484

485485
return not self.errors
486486

tests/extensions/test_extension_javascript.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
('simple_success.js', EXIT_CODE_SUCCESS, 'Search found 26 annotations in'),
1111
('group_ordering_1.js', EXIT_CODE_SUCCESS, 'Search found 3 annotations in'),
1212
('group_ordering_2.js', EXIT_CODE_SUCCESS, 'Search found 9 annotations in'),
13-
('group_failures_1.js', EXIT_CODE_FAILURE, 'File finished with an incomplete group'),
14-
('group_failures_2.js', EXIT_CODE_FAILURE, 'File finished with an incomplete group'),
13+
('group_failures_1.js', EXIT_CODE_FAILURE, 'File("group_failures_1.js") finished with an incomplete group'),
14+
('group_failures_2.js', EXIT_CODE_FAILURE, 'File("group_failures_2.js") finished with an incomplete group'),
1515
('group_failures_4.js', EXIT_CODE_FAILURE, '".. no_pii:" is not in the group that starts with'),
1616
('group_failures_5.js', EXIT_CODE_FAILURE, '".. pii_types:" is already in the group that starts with'),
1717
('choice_failures_1.js', EXIT_CODE_FAILURE, '"doesnotexist" is not a valid choice for ".. ignored:"'),

tests/extensions/test_extension_python.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
('simple_success.pyt', EXIT_CODE_SUCCESS, 'Search found 20 annotations in'),
1414
('group_ordering_1.pyt', EXIT_CODE_SUCCESS, 'Search found 3 annotations in'),
1515
('group_ordering_2.pyt', EXIT_CODE_SUCCESS, 'Search found 9 annotations in'),
16-
('group_failures_1.pyt', EXIT_CODE_FAILURE, 'File finished with an incomplete group'),
17-
('group_failures_2.pyt', EXIT_CODE_FAILURE, 'File finished with an incomplete group'),
16+
('group_failures_1.pyt', EXIT_CODE_FAILURE, 'File("group_failures_1.pyt") finished with an incomplete group'),
17+
('group_failures_2.pyt', EXIT_CODE_FAILURE, 'File("group_failures_2.pyt") finished with an incomplete group'),
1818
('choice_failures_1.pyt', EXIT_CODE_FAILURE, '"doesnotexist" is not a valid choice for ".. ignored:"'),
1919
('choice_failures_2.pyt', EXIT_CODE_FAILURE, '"doesnotexist" is not a valid choice for ".. ignored:"'),
2020
('choice_failures_3.pyt', EXIT_CODE_FAILURE, '"terrible|silly-silly" is not a valid choice for ".. ignored:"'),

0 commit comments

Comments
 (0)