Skip to content

Commit

Permalink
Merge f953b2a into 94dd348
Browse files Browse the repository at this point in the history
  • Loading branch information
kjordahl committed Apr 15, 2014
2 parents 94dd348 + f953b2a commit 5253fa0
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 12 deletions.
2 changes: 1 addition & 1 deletion CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Fixes
* Restored fast renderers for scatterplots that were unintentionally removed in
PR#101 (PR#175).
* Make the `alpha` attribute of scatter plots work as intended (PR#164).

* Resume running test for empty container that has been skipped (PR#190).

Release 4.4.1
-------------
Expand Down
11 changes: 0 additions & 11 deletions chaco/tests/plotcontainer_test_case.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import sys
import unittest

import nose

from chaco.api import HPlotContainer, OverlayPlotContainer, \
PlotComponent, VPlotContainer, GridContainer
from traits.api import Any, Tuple
Expand Down Expand Up @@ -399,15 +397,6 @@ def test_overlapping_mixed_resizable_static(self):
class GridContainerTestCase(ContainerTestCase):

def test_empty_container(self):
# FIXME:
# This test is failing when run with nosetests and coverage.
# Therefore, it is skipped when coverage is imported.
# If you want to fix this, please look at:
# https://svn.enthought.com/enthought/ticket/1618
# where I posted more details about this problem.
if 'coverage' in sys.modules:
raise nose.SkipTest

cont = GridContainer(shape=(1,1))
cont.bounds = [100,100]
cont.do_layout()
Expand Down

0 comments on commit 5253fa0

Please sign in to comment.