Ensuring that all tests are running for attribution generation

Author: pombredanne

about_code_tool/about.py

@@ -1267,7 +1267,6 @@ def generate_attribution(self, template_path=None, limit_to=None):
         limit_to = limit_to or []
 
         about_object_fields = []
-        about_content_dict = {}
         license_dict = {}
 
         not_process_components = list(limit_to)

about_code_tool/tests/test_about.py

@@ -606,25 +606,23 @@ def test_remove_blank_lines_and_no_colon_fields(self):
             self.assertEqual(expected_warnings[i][0], w.code)
             self.assertEqual(expected_warnings[i][1], w.field_value)
 
-    # FIXME: This is failing because there is no component list provided
-    def FAILING_test_generate_attribution_with_custom_template(self):
+    def test_generate_attribution_with_custom_template(self):
         expected = (u'notice_text:'
                     'version:2.4.3'
                     'about_resource:httpd-2.4.3.tar.gz'
                     'name:Apache HTTP Serverlicense_text:')
         test_file = join(TESTDATA_DIR, 'attrib/attrib.ABOUT')
         collector = about.Collector(test_file)
         template = join(TESTDATA_DIR, 'attrib/test.template')
-        result = collector.generate_attribution(template)
+        result = collector.generate_attribution(template,limit_to=[''])
         self.assertEqual(expected, result)
 
-    # FIXME: This is failing because there is no component list provided
-    def FAILING_test_generate_attribution_with_default_template(self):
+    def test_generate_attribution_with_default_template(self):
         f = open(join(TESTDATA_DIR, 'attrib/attrib.html'))
         expected = f.read()
         test_file = join(TESTDATA_DIR, 'attrib/attrib.ABOUT')
         collector = about.Collector(test_file)
-        result = collector.generate_attribution()
+        result = collector.generate_attribution(limit_to=[''])
         # Strip all the white spaces 
         self.assertEqual(re.sub(r'\s+', '', expected), re.sub(r'\s+', '', result))