Skip to content

Commit 73bdebc

Browse files
committed
fixup! Sets timestap for interval comparision just once
Since timestamp is not used when given just int to retain, can pass None for simpler code.
1 parent 71d52d2 commit 73bdebc

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

src/borg/testsuite/helpers_test.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ def subset(lst, ids):
494494
MockArchive(datetime(2017, 10, 1, 10, 0, 5, tzinfo=None), 13),
495495
]
496496
kept_because = {}
497-
keep = prune_split(archives, rule, num_to_keep, datetime.now().astimezone(), kept_because)
497+
keep = prune_split(archives, rule, num_to_keep, None, kept_because)
498498

499499
assert set(keep) == subset(archives, expected_ids)
500500
for item in keep:
@@ -517,7 +517,7 @@ def subset(lst, ids):
517517

518518
# Keep oldest when retention target can't otherwise be met
519519
kept_because = {}
520-
keep = prune_split(archives, "yearly", 3, datetime.now().astimezone(), kept_because)
520+
keep = prune_split(archives, "yearly", 3, None, kept_because)
521521

522522
assert set(keep) == subset(archives, [1, 3, 4])
523523
assert kept_because[1][0] == "yearly[oldest]"
@@ -526,7 +526,7 @@ def subset(lst, ids):
526526

527527
# Otherwise, prune it
528528
kept_because = {}
529-
keep = prune_split(archives, "yearly", 2, datetime.now().astimezone(), kept_because)
529+
keep = prune_split(archives, "yearly", 2, None, kept_because)
530530

531531
assert set(keep) == subset(archives, [3, 4])
532532
assert kept_because[3][0] == "yearly"
@@ -537,7 +537,7 @@ def test_prune_split_no_archives():
537537
archives = []
538538

539539
kept_because = {}
540-
keep = prune_split(archives, "yearly", 3, datetime.now().astimezone(), kept_because)
540+
keep = prune_split(archives, "yearly", 3, None, kept_because)
541541

542542
assert keep == []
543543
assert kept_because == {}

0 commit comments

Comments
 (0)