Update error type

Signed-off-by: Chin Yeung Li <[email protected]>

Author: chinyeungli

src/attributecode/api.py

@@ -69,16 +69,6 @@ def request_license_data(api_url, api_key, license_key):
         msg = (u"Authorization denied. Invalid '--api_key'. "
                u"License generation is skipped.")
         errors.append(Error(ERROR, msg))
-        """
-        The invalid license is handled
-        
-        else:
-            # Since no api_url/api_key/network status have
-            # problem detected, it yields 'license' is the cause of
-            # this exception.
-            msg = u"Invalid 'license': %s" % license_key
-            errors.append(Error(ERROR, msg))
-        """
     except Exception as e:
         errors.append(Error(ERROR, str(e)))
 

src/attributecode/gen.py

@@ -112,7 +112,7 @@ def check_about_resource_filename(arp):
     if invalid_chars(arp):
         msg = ("Invalid characters present in 'about_resource' "
                    "field: " + arp)
-        return (Error(CRITICAL, msg))
+        return (Error(ERROR, msg))
     return ''
 
 
@@ -184,7 +184,7 @@ def load_inventory(location, from_attrib=False, base_dir=None, scancode=False, r
         for f in required_fields:
             if f not in fields:
                 msg = "Required field: %(f)r not found in the <input>" % locals()
-                errors.append(Error(ERROR, msg))
+                errors.append(Error(CRITICAL, msg))
                 return errors, abouts
         afp = fields.get(model.About.ABOUT_RESOURCE_ATTR)
 

src/attributecode/model.py

@@ -720,7 +720,7 @@ def validate_field_name(name):
     if not is_valid_name(name):
         msg = ('Field name: %(name)r contains illegal name characters '
                '(or empty spaces) and is ignored.')
-        return Error(CRITICAL, msg % locals())
+        return Error(ERROR, msg % locals())
 
 
 class License:
@@ -954,7 +954,7 @@ def hydrate(self, fields):
         if illegal_name_list:
             msg = ('Field name: %(illegal_name_list)r contains illegal name characters '
                '(or empty spaces) and is ignored.')
-            errors.append(Error(CRITICAL, msg % locals()))
+            errors.append(Error(ERROR, msg % locals()))
         return errors
 
     def process(self, fields, about_file_path, running_inventory=False,

tests/test_gen.py

@@ -69,7 +69,7 @@ def test_check_about_resource_filename(self):
         arp2 = '/test/t!est.c'
         msg = ("Invalid characters present in 'about_resource' "
                    "field: " + arp2)
-        expected2 = Error(CRITICAL, msg)
+        expected2 = Error(ERROR, msg)
         result1 = gen.check_about_resource_filename(arp1)
         result2 = gen.check_about_resource_filename(arp2)
         assert result1 == ''
@@ -103,7 +103,7 @@ def test_load_inventory_with_errors(self):
         base_dir = get_temp_dir()
         errors, abouts = gen.load_inventory(location, base_dir=base_dir)
         expected_errors = [
-            Error(CRITICAL, "Field name: ['confirmed copyright'] contains illegal name characters (or empty spaces) and is ignored."),
+            Error(ERROR, "Field name: ['confirmed copyright'] contains illegal name characters (or empty spaces) and is ignored."),
             Error(INFO, 'Field about_resource: Path'),
             Error(INFO, "Field ['resource', 'test'] is a custom field.")
         ]

tests/test_model.py

@@ -582,7 +582,7 @@ def test_About_rejects_non_ascii_names_and_accepts_unicode_values(self):
         test_file = get_test_loc('test_model/parse/non_ascii_field_name_value.about')
         a = model.About(test_file)
         expected = [
-            Error(CRITICAL, "Field name: ['mat\xedas'] contains illegal name characters (or empty spaces) and is ignored.")
+            Error(ERROR, "Field name: ['mat\xedas'] contains illegal name characters (or empty spaces) and is ignored.")
         ]
         assert expected == a.errors