Skip to content

Commit 746f09b

Browse files
committed
Removes unnecessarily complicated local timezone in test
Default with tzinfo=None is local timezone anyway, no need to set it manually.
1 parent fc384a7 commit 746f09b

File tree

1 file changed

+17
-28
lines changed

1 file changed

+17
-28
lines changed

src/borg/testsuite/helpers_test.py

Lines changed: 17 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -456,17 +456,6 @@ def __repr__(self):
456456
return f"{self.id}: {self.ts.isoformat()}"
457457

458458

459-
# This is the local timezone of the system running the tests.
460-
# We need this e.g. to construct archive timestamps for the prune tests,
461-
# because borg prune operates in the local timezone (it first converts the
462-
# archive timestamp to the local timezone). So, if we want the y/m/d/h/m/s
463-
# values which prune uses to be exactly the ones we give [and NOT shift them
464-
# by tzoffset], we need to give the timestamps in the same local timezone.
465-
# Please note that the timestamps in a real borg archive or manifest are
466-
# stored in UTC timezone.
467-
local_tz = datetime.now(tz=timezone.utc).astimezone(tz=None).tzinfo
468-
469-
470459
@pytest.mark.parametrize(
471460
"rule,num_to_keep,expected_ids",
472461
[
@@ -486,23 +475,23 @@ def subset(lst, ids):
486475

487476
archives = [
488477
# years apart
489-
MockArchive(datetime(2015, 1, 1, 10, 0, 0, tzinfo=local_tz), 1),
490-
MockArchive(datetime(2016, 1, 1, 10, 0, 0, tzinfo=local_tz), 2),
491-
MockArchive(datetime(2017, 1, 1, 10, 0, 0, tzinfo=local_tz), 3),
478+
MockArchive(datetime(2015, 1, 1, 10, 0, 0, tzinfo=None), 1),
479+
MockArchive(datetime(2016, 1, 1, 10, 0, 0, tzinfo=None), 2),
480+
MockArchive(datetime(2017, 1, 1, 10, 0, 0, tzinfo=None), 3),
492481
# months apart
493-
MockArchive(datetime(2017, 2, 1, 10, 0, 0, tzinfo=local_tz), 4),
494-
MockArchive(datetime(2017, 3, 1, 10, 0, 0, tzinfo=local_tz), 5),
482+
MockArchive(datetime(2017, 2, 1, 10, 0, 0, tzinfo=None), 4),
483+
MockArchive(datetime(2017, 3, 1, 10, 0, 0, tzinfo=None), 5),
495484
# days apart
496-
MockArchive(datetime(2017, 3, 2, 10, 0, 0, tzinfo=local_tz), 6),
497-
MockArchive(datetime(2017, 3, 3, 10, 0, 0, tzinfo=local_tz), 7),
498-
MockArchive(datetime(2017, 3, 4, 10, 0, 0, tzinfo=local_tz), 8),
485+
MockArchive(datetime(2017, 3, 2, 10, 0, 0, tzinfo=None), 6),
486+
MockArchive(datetime(2017, 3, 3, 10, 0, 0, tzinfo=None), 7),
487+
MockArchive(datetime(2017, 3, 4, 10, 0, 0, tzinfo=None), 8),
499488
# minutes apart
500-
MockArchive(datetime(2017, 10, 1, 9, 45, 0, tzinfo=local_tz), 9),
501-
MockArchive(datetime(2017, 10, 1, 9, 55, 0, tzinfo=local_tz), 10),
489+
MockArchive(datetime(2017, 10, 1, 9, 45, 0, tzinfo=None), 9),
490+
MockArchive(datetime(2017, 10, 1, 9, 55, 0, tzinfo=None), 10),
502491
# seconds apart
503-
MockArchive(datetime(2017, 10, 1, 10, 0, 1, tzinfo=local_tz), 11),
504-
MockArchive(datetime(2017, 10, 1, 10, 0, 3, tzinfo=local_tz), 12),
505-
MockArchive(datetime(2017, 10, 1, 10, 0, 5, tzinfo=local_tz), 13),
492+
MockArchive(datetime(2017, 10, 1, 10, 0, 1, tzinfo=None), 11),
493+
MockArchive(datetime(2017, 10, 1, 10, 0, 3, tzinfo=None), 12),
494+
MockArchive(datetime(2017, 10, 1, 10, 0, 5, tzinfo=None), 13),
506495
]
507496
kept_because = {}
508497
keep = prune_split(archives, rule, num_to_keep, kept_because)
@@ -518,12 +507,12 @@ def subset(lst, ids):
518507

519508
archives = [
520509
# oldest backup, but not last in its year
521-
MockArchive(datetime(2018, 1, 1, 10, 0, 0, tzinfo=local_tz), 1),
510+
MockArchive(datetime(2018, 1, 1, 10, 0, 0, tzinfo=None), 1),
522511
# an interim backup
523-
MockArchive(datetime(2018, 12, 30, 10, 0, 0, tzinfo=local_tz), 2),
512+
MockArchive(datetime(2018, 12, 30, 10, 0, 0, tzinfo=None), 2),
524513
# year-end backups
525-
MockArchive(datetime(2018, 12, 31, 10, 0, 0, tzinfo=local_tz), 3),
526-
MockArchive(datetime(2019, 12, 31, 10, 0, 0, tzinfo=local_tz), 4),
514+
MockArchive(datetime(2018, 12, 31, 10, 0, 0, tzinfo=None), 3),
515+
MockArchive(datetime(2019, 12, 31, 10, 0, 0, tzinfo=None), 4),
527516
]
528517

529518
# Keep oldest when retention target can't otherwise be met

0 commit comments

Comments
 (0)