Skip to content

Fix #5495. Combine two tests to prevent race cond #5656

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

Merged
merged 1 commit into from
Dec 11, 2015
Merged

Fix #5495. Combine two tests to prevent race cond #5656

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 2 additions & 7 deletions lib/matplotlib/tests/test_cycles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ def test_colorcycle_basic():
ax.legend(loc='upper left')


@image_comparison(baseline_images=['marker_cycle'], remove_text=True,
extensions=['png'])
@image_comparison(baseline_images=['marker_cycle', 'marker_cycle'],
remove_text=True, extensions=['png'])
def test_marker_cycle():
fig = plt.figure()
ax = fig.add_subplot(111)
Expand All @@ -44,11 +44,6 @@ def test_marker_cycle():
ax.plot(xs, ys, label='red2 dot', lw=4, ms=16)
ax.legend(loc='upper left')


# Reuse the image from test_marker_cycle()
@image_comparison(baseline_images=['marker_cycle'], remove_text=True,
extensions=['png'])
def test_marker_cycle_keywords():
fig = plt.figure()
ax = fig.add_subplot(111)
# Test keyword arguments, numpy arrays, and generic iterators
Expand Down