Merge lp:~mabac/svammel/specify-single-component into lp:svammel

[Mattias Backman]

Hi,

This branch adds support for specifying --component from a list of 'main', 'restricted', 'universe', 'multiverse' to have svammel only work on build records from that repository component.

Thanks,

Mattias

[James Westby (james-w)]

Looks great.

Thanks,

James

review: Approve

=== modified file 'config.py'
--- config.py	2011-04-17 21:39:22 +0000
+++ config.py	2011-09-02 09:46:40 +0000
@@ -174,5 +174,9 @@
     parser.add_argument(
         '--target-series', dest='targetseries',
         help='If specified, will be nominated for all created bugs.')
+    parser.add_argument(
+        '--component',
+        choices=['main', 'restricted', 'universe', 'multiverse'],
+        help='If specified, only look for build in this repository component.')
 
     return parser

=== modified file 'data_parsing.py'
--- data_parsing.py	2011-06-07 09:16:17 +0000
+++ data_parsing.py	2011-09-02 09:46:40 +0000
@@ -163,7 +163,7 @@
     return candidate_spph
 
 
-def fetch_pkg_list(archives, build_state):
+def fetch_pkg_list(archives, build_state, component):
     all_spph = dict()
     for archive, archive_name in archives:
         logger.info("Packages with state '%s' in '%s'."
@@ -176,6 +176,12 @@
                 # Build record for an older version
                 continue
 
+            if component is not None and csp.component_name != component:
+                logger.debug("Only interested in repository '%s' but build " \
+                                 "'%s' is in '%s'" % (component, build.title,
+                                                      csp.component_name))
+                continue
+
             logger.info("Found build '%s'" % build.title)
 
             stored_spph = all_spph.get(csp.source_package_name)
@@ -324,7 +330,7 @@
 
 
 def get_build_status(archive_names, series_name, fail_platform, ok_platforms,
-                     build_state):
+                     build_state, component):
     """Download live data from lp.
 
     Parameters:
@@ -342,5 +348,5 @@
 
     logger.info("Will be getting builds from archives " + ", ".join(
             name for (archive, name) in archives))
-    spph_list = fetch_pkg_list(archives, build_state)
+    spph_list = fetch_pkg_list(archives, build_state, component)
     return filter_spph(spph_list, fail_platform, ok_platforms, archives)

=== modified file 'file-failures.py'
--- file-failures.py	2011-06-07 09:05:34 +0000
+++ file-failures.py	2011-09-02 09:46:40 +0000
@@ -90,7 +90,7 @@
 try:
     interesting_spph = get_build_status(args.archive, args.series,
                                         fail_platform, ok_platforms,
-                                        FAILED_BUILD_STATE)
+                                        FAILED_BUILD_STATE, args.component)
 except:
     logger.critical('Could not get build status.')
     raise

=== modified file 'tests/test_fail_filer.py'
--- tests/test_fail_filer.py	2011-09-01 13:51:10 +0000
+++ tests/test_fail_filer.py	2011-09-02 09:46:40 +0000
@@ -36,7 +36,9 @@
     get_highest_version,
     filter_spph,
     get_build_list,
+    fetch_pkg_list,
     )
+import data_parsing
 import bug_reporting
 from bug_reporting import (
     bug_already_filed_by_url,
@@ -84,9 +86,10 @@
 
     class MockRecord(object):
         class CSP:
-            def __init__(self, name, version):
+            def __init__(self, name, version, component_name='main'):
                 self.source_package_name = name
                 self.source_package_version = version
+                self.component_name = component_name
 
         def __init__(self, arch, datecreated, state=FAILED_BUILD_STATE,
                      name='packagename', version='1', archive=None):
@@ -112,6 +115,12 @@
             self.has_been_called = True
             return self.records_to_return
 
+    class MockBuild(object):
+        def __init__(self, csp, title):
+            self.current_source_publication = csp
+            self.title = title
+            self.arch_tag = 'armel'
+
     def setUp(self):
         super(TestFilter, self).setUp()
 
@@ -123,6 +132,37 @@
                 Launchpad, 'login_with', classmethod(mock_func)))
         init('staging', 'dummyapp', 'dummycache')
 
+    def test_fetch_wanted_component(self):
+        self.init_dummy_config()
+        pkgname = 'testname'
+        wanted_component = 'main'
+        failrecord = self.MockRecord(TEST_FAIL_ARCH, datetime.now(),
+                                     FAILED_BUILD_STATE)
+        def mock_func(archive, build_state):
+            return [self.MockBuild(self.MockRecord.CSP(
+                        pkgname, '1.0', wanted_component), 'title')]
+
+        self.useFixture(MockSomethingFixture(
+               data_parsing, 'get_build_list', mock_func))
+        pkgs = fetch_pkg_list([('archive','archive')], 'build_state',
+                              wanted_component)
+        self.assertEquals(pkgname, pkgs[pkgname].package_name)
+
+    def test_fetch_not_wanted_component(self):
+        self.init_dummy_config()
+        pkgname = 'testname'
+        wanted_component = 'main'
+        failrecord = self.MockRecord(TEST_FAIL_ARCH, datetime.now(),
+                                     FAILED_BUILD_STATE)
+        def mock_func(archive, build_state):
+            return [self.MockBuild(self.MockRecord.CSP(
+                        pkgname, '1.0',  'universe'), 'title')]
+
+        self.useFixture(MockSomethingFixture(
+               data_parsing, 'get_build_list', mock_func))
+        pkgs = fetch_pkg_list([('archive','archive')], 'build_state', wanted_component)
+        self.assertEquals(pkgs, {})
+
     def test_filter_only_checks_other_archives(self):
         self.init_dummy_config()
         archive_with_failure = self.MockArchive('failarchive')