Start to address tests

Author: mroeschke

pandas/tests/indexes/datetimes/test_timezones.py

@@ -184,11 +184,8 @@ def test_dti_tz_nat(self, tzstr):
         assert isna(idx[1])
         assert idx[0].tzinfo is not None
 
-    @pytest.mark.parametrize("tzstr", ["pytz/US/Eastern", "dateutil/US/Eastern"])
+    @pytest.mark.parametrize("tzstr", ["US/Eastern", "dateutil/US/Eastern"])
     def test_utc_box_timestamp_and_localize(self, tzstr):
-        if tzstr.startswith("pytz/"):
-            pytest.importorskip("pytz")
-            tzstr = tzstr.removeprefix("pytz/")
         tz = timezones.maybe_get_tz(tzstr)
 
         rng = date_range("3/11/2012", "3/12/2012", freq="h", tz="utc")
@@ -203,11 +200,10 @@ def test_utc_box_timestamp_and_localize(self, tzstr):
         # right tzinfo
         rng = date_range("3/13/2012", "3/14/2012", freq="h", tz="utc")
         rng_eastern = rng.tz_convert(tzstr)
-        # test not valid for dateutil timezones.
-        # assert 'EDT' in repr(rng_eastern[0].tzinfo)
-        assert "EDT" in repr(rng_eastern[0].tzinfo) or "tzfile" in repr(
-            rng_eastern[0].tzinfo
-        )
+        if "dateutil" in tzstr:
+            assert "EDT" in repr(rng_eastern[0].tzinfo) or "tzfile" in repr(
+                rng_eastern[0].tzinfo
+            )
 
     @pytest.mark.parametrize(
         "tz", [zoneinfo.ZoneInfo("US/Central"), gettz("US/Central")]

pandas/tests/tseries/offsets/test_dst.py

@@ -256,10 +256,10 @@ def test_all_offset_classes(self, tup):
     ],
 )
 def test_nontick_offset_with_ambiguous_time_error(original_dt, target_dt, offset, tz):
-    # .apply for non-Tick offsets throws AmbiguousTimeError when the target dt
+    # .apply for non-Tick offsets throws ValueError when the target dt
     # is dst-ambiguous
-    localized_dt = original_dt.tz_localize(pytz.timezone(tz))
+    localized_dt = original_dt.tz_localize(tz)
 
     msg = f"Cannot infer dst time from {target_dt}, try using the 'ambiguous' argument"
-    with pytest.raises(pytz.AmbiguousTimeError, match=msg):
+    with pytest.raises(ValueError, match=msg):
         localized_dt + offset