Skip to content

Commit

Permalink
Fixed flake issues
Browse files Browse the repository at this point in the history
  • Loading branch information
philippjfr committed Feb 19, 2018
1 parent f297383 commit a99d4a1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
1 change: 0 additions & 1 deletion holoviews/util/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ def expand_options(cls, options, backend=None):
"""
current_backend = Store.current_backend
backend_options = Store.options(backend=backend or current_backend)
groups = set(backend_options.groups.keys())
expanded = {}
for objspec, options in options.items():
objtype = objspec.split('.')[0]
Expand Down
12 changes: 4 additions & 8 deletions tests/core/testdimensioned.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
from unittest import SkipTest

from holoviews.core.dimension import Dimensioned
from holoviews.core.options import Store, Keywords, Options, OptionTree
from holoviews.element.comparison import ComparisonTestCase
from ..utils import LoggingComparisonTestCase

class TestObj(Dimensioned):
Expand Down Expand Up @@ -61,17 +58,16 @@ def test_apply_options_current_backend_style_invalid_no_match(self):
with self.assertRaisesRegexp(ValueError, err):
TestObj([]).options(zxy='A')

def test_apply_options_explicit_backend_style_invalid(self):
err = ("Unexpected option 'style_opt3' for TestObj types "
"across all extensions. Similar options for current "
"extension \('backend_2'\) are: \['style_opt1', 'style_opt2'\]\.")
def test_apply_options_explicit_backend_style_invalid_cross_backend(self):
err = ("Unexpected option 'style_opt3' for TestObj types when "
"using the 'backend_2' extension. Similar options are: "
"\['style_opt1', 'style_opt2'\]\.")
with self.assertRaisesRegexp(ValueError, err):
TestObj([]).options(style_opt3='A', backend='backend_2')

def test_apply_options_explicit_backend_style_invalid_no_match(self):
err = ("Unexpected option 'zxy' for TestObj types when using the "
"'backend_2' extension. No similar options founds\.")

with self.assertRaisesRegexp(ValueError, err):
TestObj([]).options(zxy='A', backend='backend_2')

Expand Down

0 comments on commit a99d4a1

Please sign in to comment.