Removing timedst_fixture for brevity.

robmaw · Mar 31, 2020 · 6c5936b · 6c5936b
1 parent 3afa5e5
commit 6c5936b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 26 deletions.
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -2,7 +2,6 @@
 from datetime import datetime
 
 import pytest
-from dateutil import tz
 
 from arrow import arrow, factory, formatter, locales, parser
 
@@ -30,30 +29,6 @@ def time2013_02_15_fixture(request):
     request.cls.arrow = arrow.Arrow.fromdatetime(request.cls.datetime)
 
 
-@pytest.fixture(scope="class")
-def timedst_fixture(request):
-    request.cls.before_1 = arrow.Arrow(
-        2016, 11, 6, 3, 59, tzinfo=tz.gettz("America/New_York")
-    )
-    request.cls.before_2 = arrow.Arrow(2016, 11, 6, tzinfo=tz.gettz("America/New_York"))
-    request.cls.after_1 = arrow.Arrow(
-        2016, 11, 6, 4, tzinfo=tz.gettz("America/New_York")
-    )
-    request.cls.after_2 = arrow.Arrow(
-        2016, 11, 6, 23, 59, tzinfo=tz.gettz("America/New_York")
-    )
-    request.cls.before_3 = arrow.Arrow(
-        2018, 11, 4, 3, 59, tzinfo=tz.gettz("America/New_York")
-    )
-    request.cls.before_4 = arrow.Arrow(2018, 11, 4, tzinfo=tz.gettz("America/New_York"))
-    request.cls.after_3 = arrow.Arrow(
-        2018, 11, 4, 4, tzinfo=tz.gettz("America/New_York")
-    )
-    request.cls.after_4 = arrow.Arrow(
-        2018, 11, 4, 23, 59, tzinfo=tz.gettz("America/New_York")
-    )
-
-
 @pytest.fixture(scope="class")
 def formatting_fixture(request):
     request.cls.formatter = formatter.DateTimeFormatter()

diff --git a/tests/test_arrow.py b/tests/test_arrow.py
@@ -489,7 +489,6 @@ def test_strftime(self):
         assert result == self.arrow._datetime.strftime("%Y")
 
 
-@pytest.mark.usefixtures("timedst_fixture")
 class TestArrowFalsePositiveDst:
     """These tests relate to issues #376 and #551.
     The key points in both issues are that arrow will assign a UTC timezone if none is provided and
@@ -515,6 +514,22 @@ class TestArrowFalsePositiveDst:
     """
 
     def test_dst(self):
+        self.before_1 = arrow.Arrow(
+            2016, 11, 6, 3, 59, tzinfo=tz.gettz("America/New_York")
+        )
+        self.before_2 = arrow.Arrow(2016, 11, 6, tzinfo=tz.gettz("America/New_York"))
+        self.after_1 = arrow.Arrow(2016, 11, 6, 4, tzinfo=tz.gettz("America/New_York"))
+        self.after_2 = arrow.Arrow(
+            2016, 11, 6, 23, 59, tzinfo=tz.gettz("America/New_York")
+        )
+        self.before_3 = arrow.Arrow(
+            2018, 11, 4, 3, 59, tzinfo=tz.gettz("America/New_York")
+        )
+        self.before_4 = arrow.Arrow(2018, 11, 4, tzinfo=tz.gettz("America/New_York"))
+        self.after_3 = arrow.Arrow(2018, 11, 4, 4, tzinfo=tz.gettz("America/New_York"))
+        self.after_4 = arrow.Arrow(
+            2018, 11, 4, 23, 59, tzinfo=tz.gettz("America/New_York")
+        )
         assert self.before_1.day == self.before_2.day
         assert self.after_1.day == self.after_2.day
         assert self.before_3.day == self.before_4.day