Evolinx/evorepo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

devel: reporead remove old flagrequests

Browse Source 
When updating a package in our repository remove any old 'flagged out of
date' requests.
This commit is contained in:
Jelle van der Waa 2018-07-07 22:27:54 +02:00
parent f8958f8f8e
commit 6ceb818145
2 changed files with 57 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devel/management/commands/reporead.py
View File

@ -33,7 +33,7 @@
from devel.utils import UserFinder
from main.models import Arch, Package, PackageFile, Repo
from packages.models import Depend, Conflict, Provision, Replacement, Update, PackageRelation
from packages.models import Depend, Conflict, FlagRequest, Provision, Replacement, Update, PackageRelation
from packages.utils import parse_version
@ -216,6 +216,13 @@ def populate_pkg(dbpkg, repopkg, force=False, timestamp=None):
elif dbpkg.pkgver is None or dbpkg.pkgver != repopkg.ver:
dbpkg.flag_date = None
# Remove flagged out of date objects when a package is updated.
if dbpkg.epoch != repopkg.epoch or dbpkg.pkgver != repopkg.ver:
repo = Repo.objects.get(name__iexact=repopkg.repo)
requests = FlagRequest.objects.filter(pkgbase=repopkg.base, repo=repo)
requests = requests.exclude(pkgver=repopkg.ver, epoch=repopkg.epoch)
requests.delete()
if repopkg.base:
dbpkg.pkgbase = repopkg.base
else:

50
devel/tests/test_reporead.py
View File

@ -1,19 +1,34 @@
import tarfile
from mock import patch
from datetime import datetime
from django.core.management import call_command
from django.core.management.base import CommandError
from django.test import TransactionTestCase
from django.utils import timezone
from main.models import Package
from main.models import Arch, Package, Repo
from packages.models import FlagRequest
# Django's TestCase is wrapped in transaction, therefore use TransactionTestCase
class RepoReadTest(TransactionTestCase):
fixtures = ['main/fixtures/arches.json', 'main/fixtures/repos.json']
def create_pkg(self, repo=None, pkgver='4.10.1', pkgrel='1'):
if not repo:
repo = Repo.objects.get(name__iexact='core')
arch = Arch.objects.get(name__iexact='any')
now = datetime.now(tz=timezone.utc)
return Package.objects.create(arch=arch, repo=repo, pkgname='systemd',
pkgbase='systemd', pkgver=pkgver,
pkgrel=pkgrel, pkgdesc='Linux kernel',
compressed_size=10, installed_size=20,
last_update=now, created=now)
def test_invalid_args(self):
with self.assertRaises(CommandError) as e:
call_command('reporead')
@ -39,3 +54,36 @@ def test_read_packages(self):
packages = Package.objects.all()
import_packages = ["{}-{}-{}".format(pkg.pkgname, pkg.pkgver, pkg.pkgrel) for pkg in packages]
self.assertItemsEqual(files, import_packages)
def test_flagoutofdate(self):
pkg = self.create_pkg()
FlagRequest.objects.create(pkgbase=pkg.pkgbase, repo=pkg.repo,
pkgver=pkg.pkgver, epoch=pkg.epoch,
ip_address='1.1.1.1')
with patch('devel.management.commands.reporead.logger') as logger:
call_command('reporead', 'x86_64', 'devel/fixtures/core.db.tar.gz')
logger.info.assert_called()
self.assertEqual(len(FlagRequest.objects.all()), 0)
def test_flagoutofdate_staging(self):
staging = Repo.objects.get(name__iexact='staging')
pkg = self.create_pkg()
staging_pkg = self.create_pkg(repo=staging, pkgrel='2')
FlagRequest.objects.create(pkgbase=pkg.pkgbase, repo=pkg.repo,
pkgver=pkg.pkgver, epoch=pkg.epoch,
ip_address='1.1.1.1')
FlagRequest.objects.create(pkgbase=staging_pkg.pkgbase, repo=staging_pkg.repo,
pkgver=staging_pkg.pkgver, epoch=staging_pkg.epoch,
ip_address='1.1.1.1')
with patch('devel.management.commands.reporead.logger') as logger:
call_command('reporead', 'x86_64', 'devel/fixtures/core.db.tar.gz')
logger.info.assert_called()
objects = FlagRequest.objects.all()
self.assertEqual(len(objects), 1)
self.assertEqual(objects[0].pkgver, staging_pkg.pkgver)