Fixed #67

Add code/test code for handling blank line

Author: chinyeungli

about_code_tool/genabout.py

@@ -118,17 +118,25 @@ def read_input(self, input_file, mapping):
                 if not version == 'version':
                     del line[version]
                 if not line['about_file']:
-                    missing_about_file = "'about_file' field value is missing. Generation is skipped."
-                    self.errors.append(Error('about_file', None, missing_about_file))
+                    # This code is to handle blank line
+                    for key in line.keys():
+                        if line[key]:
+                            missing_about_file = "'about_file' field value is missing. Generation is skipped."
+                            self.errors.append(Error('about_file', None, missing_about_file))
+                            break
                     continue
             except Exception as e:
                 print(repr(e))
                 print("The input does not have the 'about_file' key which is required.")
                 sys.exit(errno.EINVAL)
             try:
                 if not line['about_resource']:
-                    missing_about_resource = "'about_resource' is missing. Generation is skipped."
-                    self.errors.append(Error('about_resource', line['about_file'], missing_about_resource))
+                    # This code is to handle blank line
+                    for key in line.keys():
+                        if line[key]:
+                            missing_about_resource = "'about_resource' is missing. Generation is skipped."
+                            self.errors.append(Error('about_resource', line['about_file'], missing_about_resource))
+                            break
                     continue
             except Exception as e:
                 print(repr(e))

about_code_tool/tests/test_genabout.py

@@ -35,6 +35,12 @@ def test_read_input(self):
         list = gen.read_input(test_input, False)
         self.assertTrue(list, "List shouldn't be empty.")
 
+    def test_read_input_with_blank_line(self):
+        gen = genabout.GenAbout()
+        test_input = join(TESTDATA_PATH, "test_files_for_genabout/contains_blank_line.csv")
+        list = gen.read_input(test_input, False)
+        self.assertTrue(list, "List shouldn't be empty.")
+
     def test_read_input_missing_about_file(self):
         gen = genabout.GenAbout()
         test_input = join(TESTDATA_PATH, "test_files_for_genabout/missing_about_file.csv")

about_code_tool/tests/testdata/test_files_for_genabout/contains_blank_line.csv

@@ -0,0 +1,5 @@
+about_file,about_resource,name,version
+test_blank line,/tmp/,blank line,0.8.1
+blank line below,/tmp/1/,,
+,,,
+blank line above,/tmp/2/,,