Skip to content

Commit

Permalink
Wind the obsolete package exipry threshold age forward
Browse files Browse the repository at this point in the history 
Wind the obsolete package exipry threshold age forward, and update tests
appropriately.
  • Loading branch information
@jon-turney
jon-turney committed Jun 19, 2024
1 parent 954c343 commit 3fbed76
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 54 deletions.
2 changes: 1 addition & 1 deletion calm/package.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1720,7 +1720,7 @@ def mark_fn(packages, po, v, certain_age, obs_threshold, vault_requests):
#

SO_AGE_THRESHOLD_YEARS = 5
OBSOLETE_AGE_THRESHOLD_YEARS = 8
OBSOLETE_AGE_THRESHOLD_YEARS = 7


def stale_packages(packages, vault_requests):
Expand Down
2 changes: 1 addition & 1 deletion calm/past_mistakes.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,9 +295,9 @@
# these packages probably should be marked as self-destruct?
'mate-utils': '',
'python-twisted-debuginfo': '',
'texlive-collection-htmlxml': '',
'vte2.91': '',
# self-destruct, or need to start to exist
'cron-debuginfo': '',
'texlive-collection-htmlxml': '',
'w32api': '',
}
8 changes: 1 addition & 7 deletions test/testdata/conflict/rel_area.expected
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,7 @@
'x86_64/release/proj': ['proj-4.8.0-1.hint', 'sha512.sum'],
'x86_64/release/proj/libproj-devel': ['libproj-devel-4.8.0-1.hint', 'sha512.sum'],
'x86_64/release/proj/libproj1': ['libproj1-4.8.0-1.hint', 'sha512.sum'],
'x86_64/release/rpm-doc': ['rpm-doc-4.1-2-src.hint',
'rpm-doc-4.1-2-src.tar.bz2',
'rpm-doc-4.1-2.hint',
'rpm-doc-4.1-2.tar.bz2',
'rpm-doc-999-1.hint',
'rpm-doc-999-1.tar.bz2',
'sha512.sum'],
'x86_64/release/rpm-doc': ['rpm-doc-999-1.hint', 'rpm-doc-999-1.tar.bz2', 'sha512.sum'],
'x86_64/release/splint': ['sha512.sum', 'splint-3.1.2-1.hint'],
'x86_64/release/staleversion': ['override.hint',
'sha512.sum',
Expand Down
4 changes: 4 additions & 0 deletions test/testdata/conflict/vault.expected
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{'.': [],
'x86_64': [],
'x86_64/release': [],
'x86_64/release/rpm-doc': ['rpm-doc-4.1-2-src.hint',
'rpm-doc-4.1-2-src.tar.bz2',
'rpm-doc-4.1-2.hint',
'rpm-doc-4.1-2.tar.bz2'],
'x86_64/release/staleversion': ['staleversion-240-1-src.hint',
'staleversion-240-1-src.tar.xz',
'staleversion-240-1.hint',
Expand Down
4 changes: 1 addition & 3 deletions test/testdata/process_arch/htdocs.expected
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
'per-version.html',
'perl-Net-SMTP-SSL-src.html',
'perl-Net-SMTP-SSL.html',
'rpm-doc-src.html',
'rpm-doc.html',
'staleversion-src.html',
'staleversion.html',
Expand Down Expand Up @@ -82,8 +81,7 @@
'perl-Net-SMTP-SSL-1.02-1-src',
'perl-Net-SMTP-SSL-1.03-1-src',
'perl-Net-SMTP-SSL-1.03-2-src'],
'x86_64/rpm-doc': ['.htaccess', 'rpm-doc-4.1-2', 'rpm-doc-999-1'],
'x86_64/rpm-doc-src': ['.htaccess', 'rpm-doc-4.1-2-src'],
'x86_64/rpm-doc': ['.htaccess', 'rpm-doc-999-1'],
'x86_64/staleversion': ['.htaccess', 'staleversion-243-0', 'staleversion-250-0', 'staleversion-260-0'],
'x86_64/staleversion-src': ['.htaccess', 'staleversion-243-0-src', 'staleversion-250-0-src', 'staleversion-260-0-src'],
'x86_64/test-c': ['.htaccess', 'test-c-1.0-1'],
Expand Down
23 changes: 1 addition & 22 deletions test/testdata/process_arch/packages.json.expected
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
('{\n'
' "num_packages": 17,\n'
' "num_packages": 16,\n'
' "packages": [\n'
' {\n'
' "arches": [\n'
Expand Down Expand Up @@ -314,27 +314,6 @@
' "arches": [\n'
' "x86_64"\n'
' ],\n'
' "name": "rpm-doc",\n'
' "subpackages": [\n'
' {\n'
' "categories": [\n'
' "_obsolete"\n'
' ],\n'
' "name": "rpm-doc"\n'
' }\n'
' ],\n'
' "summary": "Obsolete package for RPM package management system manual pages (extra text to so repr is '
'not one line)",\n'
' "versions": {\n'
' "stable": [\n'
' "4.1-2"\n'
' ]\n'
' }\n'
' },\n'
' {\n'
' "arches": [\n'
' "x86_64"\n'
' ],\n'
' "maintainers": [\n'
' "Blooey McFooey"\n'
' ],\n'
Expand Down
8 changes: 1 addition & 7 deletions test/testdata/process_arch/rel_area.expected
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,13 +157,7 @@
'x86_64/release/proj': ['proj-4.8.0-1.hint', 'sha512.sum'],
'x86_64/release/proj/libproj-devel': ['libproj-devel-4.8.0-1.hint', 'sha512.sum'],
'x86_64/release/proj/libproj1': ['libproj1-4.8.0-1.hint', 'sha512.sum'],
'x86_64/release/rpm-doc': ['rpm-doc-4.1-2-src.hint',
'rpm-doc-4.1-2-src.tar.bz2',
'rpm-doc-4.1-2.hint',
'rpm-doc-4.1-2.tar.bz2',
'rpm-doc-999-1.hint',
'rpm-doc-999-1.tar.bz2',
'sha512.sum'],
'x86_64/release/rpm-doc': ['rpm-doc-999-1.hint', 'rpm-doc-999-1.tar.bz2', 'sha512.sum'],
'x86_64/release/splint': ['sha512.sum', 'splint-3.1.2-1.hint'],
'x86_64/release/staleversion': ['override.hint',
'sha512.sum',
Expand Down
6 changes: 0 additions & 6 deletions test/testdata/process_arch/setup.ini.expected
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,12 +288,6 @@
'version: 999-1\n'
'install: x86_64/release/rpm-doc/rpm-doc-999-1.tar.bz2 42 '
'28c70b843fe01d90a3eeab4a3617551d236cd0b7d69668d1b1b6c8b14a9fd050e4039c192894c93bdf31575771c58c1fea2a41c24c8da22d10080d8b032b6369\n'
'[prev]\n'
'version: 4.1-2\n'
'install: x86_64/release/rpm-doc/rpm-doc-4.1-2.tar.bz2 50941 '
'7cc9db802364252e3206ce9f75c8ca53813d8308a22a425b50ef695dd8e51568740b06739d3aa3399a83fb3d3e1345ab7e2ad03a1e9d47c02dded3363bf4f493\n'
'source: x86_64/release/rpm-doc/rpm-doc-4.1-2-src.tar.bz2 188 '
'a4ee9121cfff2ccd5b4d84ffd18d2cff0ea071cef3c5416b8825d7b7f7cff8a8873c71832f3f3cb8742d004f9db34e9d160ad613b5df839723a3f986f0901402\n'
'\n'
'@ staleversion\n'
'sdesc: "Test package for stale version removal"\n'
Expand Down
4 changes: 4 additions & 0 deletions test/testdata/process_arch/vault.expected
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
'perl-Net-SMTP-SSL-1.01-1.tar.xz'],
'x86_64': [],
'x86_64/release': [],
'x86_64/release/rpm-doc': ['rpm-doc-4.1-2-src.hint',
'rpm-doc-4.1-2-src.tar.bz2',
'rpm-doc-4.1-2.hint',
'rpm-doc-4.1-2.tar.bz2'],
'x86_64/release/staleversion': ['staleversion-240-1-src.hint',
'staleversion-240-1-src.tar.xz',
'staleversion-240-1.hint',
Expand Down
8 changes: 1 addition & 7 deletions test/testdata/upload_bad_auth/rel_area.expected
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,7 @@
'x86_64/release/proj': ['proj-4.8.0-1.hint', 'sha512.sum'],
'x86_64/release/proj/libproj-devel': ['libproj-devel-4.8.0-1.hint', 'sha512.sum'],
'x86_64/release/proj/libproj1': ['libproj1-4.8.0-1.hint', 'sha512.sum'],
'x86_64/release/rpm-doc': ['rpm-doc-4.1-2-src.hint',
'rpm-doc-4.1-2-src.tar.bz2',
'rpm-doc-4.1-2.hint',
'rpm-doc-4.1-2.tar.bz2',
'rpm-doc-999-1.hint',
'rpm-doc-999-1.tar.bz2',
'sha512.sum'],
'x86_64/release/rpm-doc': ['rpm-doc-999-1.hint', 'rpm-doc-999-1.tar.bz2', 'sha512.sum'],
'x86_64/release/splint': ['sha512.sum', 'splint-3.1.2-1.hint'],
'x86_64/release/staleversion': ['override.hint',
'sha512.sum',
Expand Down
4 changes: 4 additions & 0 deletions test/testdata/upload_bad_auth/vault.expected
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{'.': [],
'x86_64': [],
'x86_64/release': [],
'x86_64/release/rpm-doc': ['rpm-doc-4.1-2-src.hint',
'rpm-doc-4.1-2-src.tar.bz2',
'rpm-doc-4.1-2.hint',
'rpm-doc-4.1-2.tar.bz2'],
'x86_64/release/staleversion': ['staleversion-240-1-src.hint',
'staleversion-240-1-src.tar.xz',
'staleversion-240-1.hint',
Expand Down

0 comments on commit 3fbed76

Please sign in to comment.