Merge pull request #710 from cevich/fixdockerlatest

Add docker-latest to list of BZ components to scan

Author: cevich

config_defaults/control.ini

@@ -76,8 +76,8 @@ key_match = docker-autotest
 # 'key_match' above.
 
 product = Red Hat Enterprise Linux 7, Fedora
-component = docker, docker-distribution, docker-registry, atomic,
-            rhel-server-atomic, rhel-server-docker, rhel-tools-docker,
+component = docker, docker-latest, docker-distribution, docker-registry,
+            atomic, rhel-server-atomic, rhel-server-docker, rhel-tools-docker,
             rsyslog-docker, sadc-docker, sssd-docker, runc, skopeo,
-            ostree, rpm-ostree
+            ostree, rpm-ostree, docker-selinux, container-selinux
 status = NEW, ASSIGNED, POST, MODIFIED, ON_DEV, VERIFIED

control

@@ -57,7 +57,7 @@ def subtests_subsubtests(subthing_set, subtest_modules):
     subtest_to_subsubtest = {}
     for subthing in subthing_set:
         parent = subtest_of_subsubtest(subthing, subtest_modules)
-        if parent == None:
+        if parent is None:
             subtest = subthing
             subsubtest = set()
         else:
@@ -153,64 +153,62 @@ class ControlINI(ConfigParser.SafeConfigParser, Singleton):
     Representation of control settings
     """
 
-    # Default relative locations for control settings files
-    CONTROL_INI_DEFAULT = "config_defaults/control.ini"
-    CONTROL_INI_CUSTOM = "config_custom/control.ini"
-
-    # Mapping of option-name to section name (for generating defaults)
-    OPT_SEC_MAP = {'include': 'Control',
-                   'exclude': 'Control',
-                   'subthings': 'Control',
-                   'pretests': 'Control',
-                   'subtests': 'Control',
-                   'intratests': 'Control',
-                   'posttests': 'Control',
-                   'url': 'Bugzilla',
-                   'username': 'Bugzilla',
-                   'password': 'Bugzilla',
-                   'excluded': 'Bugzilla',
-                   'key_field': 'Bugzilla',
-                   'key_match': 'Bugzilla',}
-
-    # Absolute base path where all other relative paths reside
+    # Absolute base path to prefix onto below
     control_path = os.path.dirname(job.control)
 
+    # Default relative locations, prefixed by above
+    control_ini_default = os.path.join(control_path,
+                                       "config_defaults/control.ini")
+    control_ini_custom = os.path.join(control_path,
+                                      "config_custom/control.ini")
+
     # Default location where write() writes to if no file given
     write_path = job.resultdir
 
     # Token that signals not to execute tests
     NOEXECTOK = '!!!'
 
     def __init__(self):
-        # Help catch missing options in defaults but not in OPT_SEC_MAP
-        # by making them None instead of ''
-        super(ControlINI, self).__init__(allow_no_value=True)
+        # Inject defaults dict into ancestor's initialization
+        super(ControlINI, self).__init__(self.defaults(), allow_no_value=True)
         self.optionxform = str  # support case-sensitive options
-        for option, section in self.OPT_SEC_MAP.iteritems():
-            try:
-                self.add_section(section)
-            except ConfigParser.DuplicateSectionError:
-                pass  # already existing section
-            # Empty string is the default value
-            self.set(section, option, '')
-        # These option values default to the option name, look up section
-        for key in ('pretests', 'subtests', 'intratests', 'posttests'):
-            self.set(self.OPT_SEC_MAP[key], key, key)
+
+    def defaults(self):  # Part of the ConfigParser interface
+        """Return a dictionary containing the instance-wide defaults."""
+        return dict(include='', exclude='', subthings='',
+                    pretests='pretests', subtests='subtests',
+                    intratests='intratests', posttests='posttests',
+                    url='', username='', password='',
+                    excluded='', key_field='',
+                    key_match='', product='', component='',
+                    status='')
 
     def read(self, filenames=None):
         """
-        Read CONTROL_INI_DEFAULT or CONTROL_INI_CUSTOM if filenames is None
-        """
-        if filenames is None:
-            control_ini_default = os.path.join(self.control_path,
-                                               self.CONTROL_INI_DEFAULT)
-            control_ini_custom = os.path.join(self.control_path,
-                                              self.CONTROL_INI_CUSTOM)
-            filenames = [control_ini_default, control_ini_custom]
-        result = super(ControlINI, self).read(filenames)
-        if len(result) == 0:
-            result = ["<ControlINI defaults>"]
-        logging.debug("Loaded control configuration from %s", str(result[-1]))
+        Read default and/or custom control.init plus filesnames
+
+        :param filenames: List of filenames to attempt to load (in order)
+        returns: Representation of loaded items
+        rtype: list
+        """
+        if filenames is None:  # Preserve ancestor interface just in case
+            filenames = []
+        filenames.append(self.control_ini_custom)
+        result = ["<Empty Defaults>"]
+        # Try load defaults via readfp as documented
+        try:
+            with open(self.control_ini_default, 'rb') as defaults_file:
+                # readfp does _not_ merge content, defaults still
+                # used for missing keys, upon reference.
+                super(ControlINI, self).readfp(defaults_file)
+                result.append(defaults_file.name)
+        except IOError:
+            pass  # Use defaults set from __init__()
+        # _merge_ any content from the last readable item in filenames
+        loaded = super(ControlINI, self).read(filenames)
+        if loaded:
+            result += loaded
+        logging.debug("Loaded control configuration from %s", result)
         return result
 
     def write(self, fileobject=None):