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

Improve code example in marbles.core.TestCase docstring #154

Merged
merged 6 commits into from
Dec 28, 2023
Merged

Improve code example in marbles.core.TestCase docstring #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4adf5e9
Improve code example in marbles.core.TestCase docstring
joshhn Dec 20, 2023
00486dc
Fix typo in marbles.core
joshhn Dec 20, 2023
255263f
Add .DS_Store to .gitignore
joshhn Dec 20, 2023
19e8c16
Resolve conflict
joshhn Dec 25, 2023
dfdd0a1
Merge branch 'main' into main
leifwalsh Dec 28, 2023
82e29bd
Update marbles/core/marbles/core/marbles.py
joshhn Dec 28, 2023
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ coverage.xml
*.pyc
.eggs
.venv/
**/.DS_Store
4 changes: 2 additions & 2 deletions marbles/core/marbles/core/marbles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ class AnnotationError(Exception):


class ContextualAssertionError(AssertionError):
'''Extends :class:`AssertionError` to accept and display additiona
'''Extends :class:`AssertionError` to accept and display additional
information beyond the static ``msg`` parameter provided by
:mod:`unittest` assertions.

Expand Down Expand Up @@ -526,7 +526,7 @@ class TestCase(unittest.TestCase):
Example:

.. literalinclude:: examples/getting_started.py.annotated
:lines: 1-4,26-43
:lines: 1-4,33-44
'''

failureException = ContextualAssertionError
Expand Down
Loading