From 140e16290b72477e14147b0f4baa57ed77af2e27 Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Tue, 16 Jul 2013 09:14:46 -0400 Subject: [PATCH] TST: no need for flavor testing in skip Skip bs4 tests when 4.2.0 is found. --- pandas/io/tests/test_html.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pandas/io/tests/test_html.py b/pandas/io/tests/test_html.py index d7c46ea898b33..ad6c2d215be32 100644 --- a/pandas/io/tests/test_html.py +++ b/pandas/io/tests/test_html.py @@ -43,9 +43,17 @@ def _skip_if_no(module_name): def _skip_if_none_of(module_names): if isinstance(module_names, basestring): _skip_if_no(module_names) + if module_names == 'bs4': + import bs4 + if bs4.__version__ == LooseVersion('4.2.0'): + raise nose.SkipTest else: if not all(_have_module(module_name) for module_name in module_names): raise nose.SkipTest + if 'bs4' in module_names: + import bs4 + if bs4.__version__ == LooseVersion('4.2.0'): + raise nose.SkipTest DATA_PATH = get_data_path() @@ -82,10 +90,6 @@ def run_read_html(self, *args, **kwargs): def try_skip(self): _skip_if_none_of(('bs4', 'html5lib')) - import bs4 - if (bs4.__version__ == LooseVersion('4.2.0') and - self.flavor != ['lxml']): - raise nose.SkipTest def setup_data(self): self.spam_data = os.path.join(DATA_PATH, 'spam.html') @@ -425,7 +429,8 @@ def try_skip(self): def test_spam_data_fail(self): from lxml.etree import XMLSyntaxError spam_data = os.path.join(DATA_PATH, 'spam.html') - self.assertRaises(XMLSyntaxError, self.run_read_html, spam_data, flavor=['lxml']) + self.assertRaises(XMLSyntaxError, self.run_read_html, spam_data, + flavor=['lxml']) def test_banklist_data_fail(self): from lxml.etree import XMLSyntaxError