From f2ee3eda585e4aab3de7bf6197359f04848a2c67 Mon Sep 17 00:00:00 2001 From: Tim Lauridsen <timlau@fedoraproject.org> Date: Thu, 23 Apr 2015 14:40:29 +0200 Subject: [PATCH] add support for pkg filelist Added test for updateinfo updated --- python/dnfdaemon/server/__init__.py | 3 +-- test/support.py | 7 ++++++- test/test_common.py | 6 +++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/python/dnfdaemon/server/__init__.py b/python/dnfdaemon/server/__init__.py index 2d08b2f..58ec7da 100644 --- a/python/dnfdaemon/server/__init__.py +++ b/python/dnfdaemon/server/__init__.py @@ -772,9 +772,8 @@ class DnfDaemonBase(dbus.service.Object, DownloadCallback): def _get_filelist(self, po): """Get filelist for a package.""" - # TODO : filelist is not supported in DNF yet if po: - value = None + value = po.files else: value = None return value diff --git a/test/support.py b/test/support.py index df72ec2..d7f8896 100644 --- a/test/support.py +++ b/test/support.py @@ -18,6 +18,7 @@ from __future__ import absolute_import from __future__ import unicode_literals +import datetime import dnf import dnf.cli.cli import dnf.cli.demand @@ -171,7 +172,7 @@ class FakeAdvisory(object): self.title = 'Advisory Title' self.filenames = ['%s.rpm' % pkg] self.references = [FakeAdvisoryRef('1234567')] - + self.updated = datetime.datetime(2015, 12, 2, 11, 12, 13) class MockPackage(object): def __init__(self, nevra, repo=None): @@ -201,6 +202,10 @@ class MockPackage(object): def get_advisories(self, h_filter): return [FakeAdvisory(self.str)] + @property + def files(self): + return ['/usr/bin/foobar', '/etc/foobar.conf'] + class MockRepo(dnf.repo.Repo): def valid(self): diff --git a/test/test_common.py b/test/test_common.py index 5ecdfca..34130a7 100644 --- a/test/test_common.py +++ b/test/test_common.py @@ -3,9 +3,11 @@ import dnfdaemon.server import dnfdaemon.server.backend as backend +import datetime import test.support as support import hawkey import json +import time from unittest import mock TEST_LOCAL_PKG = 'local-pkg,0,1.0,1.fc22,noarch,@commandline' @@ -79,6 +81,8 @@ class TestAdvisory(support.TestCase): self.assertEqual(adv['type'], hawkey.ADVISORY_BUGFIX) self.assertEqual(adv['title'], 'Advisory Title') self.assertEqual(adv['filenames'], ['bar-2.0-1.noarch.rpm']) + self.assertEqual(adv['updated'], "2015-12-02 11:12:13") + # check references ref = adv['references'][0] self.assertEqual(ref, [hawkey.REFERENCE_BUGZILLA, @@ -228,7 +232,7 @@ class TestCommonMisc(TestCommonBase): attr = self.daemon.get_attribute(pkg_id, 'changelog') self.assertEqual(json.loads(attr), None) attr = self.daemon.get_attribute(pkg_id, 'filelist') - self.assertEqual(json.loads(attr), None) + self.assertEqual(json.loads(attr), []) def test_search_with_attr_all(self): """Test search_with_attr (all)""" -- GitLab