Skip to content

Commit

Permalink
Removed conditional skip for tests that didn't work in Python 2
Browse files Browse the repository at this point in the history
refs #442
  • Loading branch information
brunobord committed Jan 10, 2020
1 parent 9b9bbbb commit f0b5c11
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 13 deletions.
9 changes: 1 addition & 8 deletions workalendar/tests/test_scotland.py
@@ -1,6 +1,5 @@
from datetime import date
from unittest import TestCase, skipIf
import sys
from unittest import TestCase
import warnings

from . import GenericCalendarTest
Expand All @@ -13,9 +12,6 @@
)


PY2 = sys.version_info[0] == 2


class GoodFridayTestMixin:
def test_good_friday(self):
holidays = self.cal.holidays_set(2018)
Expand Down Expand Up @@ -275,9 +271,6 @@ class ScotlandTest(GenericCalendarTest):
"""
cal_class = Scotland

# For some reason, the Python 2 warnings module doesn't trigger a warning
# at each call of constructor ; skipping if we're in a Python2 env.
@skipIf(PY2, "Python 2 warnings unsupported")
def test_init_warning(self):
warnings.simplefilter("always")
with warnings.catch_warnings(record=True) as w:
Expand Down
6 changes: 1 addition & 5 deletions workalendar/tests/test_usa.py
@@ -1,6 +1,5 @@
from unittest import skip, skipIf
from unittest import skip
from datetime import date
import sys
import warnings

from . import GenericCalendarTest
Expand All @@ -24,8 +23,6 @@
AmericanSamoa, ChicagoIllinois, Guam, SuffolkCountyMassachusetts,
)

PY2 = sys.version_info[0] == 2


class UnitedStatesTest(GenericCalendarTest):
cal_class = UnitedStates
Expand Down Expand Up @@ -667,7 +664,6 @@ class FloridaLegalTest(IncludeMardiGras, ElectionDayEveryYear,
"""
cal_class = FloridaLegal

@skipIf(PY2, "Python 2 warnings unsupported")
def test_init_warning(self):
warnings.simplefilter("always")
with warnings.catch_warnings(record=True) as w:
Expand Down

0 comments on commit f0b5c11

Please sign in to comment.