Fix the test code.

Previous commit add an extra argunment to the "pre_generation" function which I forgot to update the test code.

It's all green now.

Author: chinyeungli

about_code_tool/genabout.py

@@ -621,4 +621,4 @@ def main(args, opts):
         option_usage()
         sys.exit(errno.EINVAL)
 
-    main(args, opts)
+    main(args, opts)

about_code_tool/tests/test_genabout.py

@@ -80,7 +80,7 @@ def test_pre_generation_about_exists_action_0(self):
         input_list = [[{'about_file': 'about.py.ABOUT', 'version': '0.8.1',
                         'about_resource': '.', 'name': 'ABOUT tool'}]]
         expected_output_list = []
-        output_list = gen.pre_generation(gen_location, input_list, action_num, False)
+        output_list, lic_output_list = gen.pre_generation(gen_location, input_list, action_num, False, False)
         self.assertTrue(expected_output_list == output_list, "This output_list should be empty.")
         self.assertTrue(len(gen.warnings) == 1, "Should return 1 warnings.")
         self.assertFalse(gen.errors, "No errors should be returned.")
@@ -93,7 +93,7 @@ def test_pre_generation_about_exists_action_1(self):
         expected_output_list = [[join(TESTDATA_PATH, 'test_files_for_genabout/about.py.ABOUT'),
                                  {'about_file': 'about.py.ABOUT', 'version': '0.8.2',
                                   'about_resource': '.', 'name': 'ABOUT tool'}]]
-        output_list = gen.pre_generation(GEN_LOCATION, input_list, action_num, False)
+        output_list, lic_output_list = gen.pre_generation(GEN_LOCATION, input_list, action_num, False, False)
         self.assertTrue(expected_output_list == output_list)
         self.assertFalse(gen.warnings, "No warnings should be returned.")
         self.assertFalse(gen.errors, "No errors should be returned.")
@@ -107,7 +107,7 @@ def test_pre_generation_about_exists_action_2(self):
                                   {'test': 'test sample', 'about_file': 'about.py.ABOUT',
                                     'version': '0.8.1', 'about_resource': '.',
                                      'name': 'ABOUT tool'}]]
-        output_list = gen.pre_generation(GEN_LOCATION, input_list, action_num, False)
+        output_list, lic_output_list = gen.pre_generation(GEN_LOCATION, input_list, action_num, False, False)
         self.assertTrue(expected_output_list == output_list)
         self.assertFalse(gen.warnings, "No warnings should be returned.")
         self.assertFalse(gen.errors, "No errors should be returned.")
@@ -120,7 +120,7 @@ def test_pre_generation_about_exists_action_3(self):
         expected_output_list = [[join(TESTDATA_PATH, 'test_files_for_genabout/about.py.ABOUT'),
                                   {'about_file': 'about.py.ABOUT', 'version': '0.8.2',
                                     'about_resource': '.', 'name': '', 'test': 'test sample'}]]
-        output_list = gen.pre_generation(GEN_LOCATION, input_list, action_num, False)
+        output_list, lic_output_list = gen.pre_generation(GEN_LOCATION, input_list, action_num, False, False)
         self.assertTrue(expected_output_list == output_list)
         self.assertFalse(gen.warnings, "No warnings should be returned.")
         self.assertFalse(gen.errors, "No errors should be returned.")
@@ -133,7 +133,7 @@ def test_pre_generation_all_in_one(self):
                          'about_resource': 'elasticsearch-0.19.8.zip',
                          'name': 'ElasticSearch'}]]
         expected_output_list = []
-        output_list = gen.pre_generation(GEN_LOCATION, input_list, action_num, True)
+        output_list, lic_output_list = gen.pre_generation(GEN_LOCATION, input_list, action_num, True, False)
         self.assertFalse(os.path.exists('testdata/test_files_for_genabout/test_generation'),
                           "This directory shouldn't be generaetd as the all_in_one is set to True.")
         self.assertTrue(expected_output_list == output_list, "This output_list should be empty.")

about_code_tool/tests/testdata/test_files_for_genabout/about-mapping-sample.csv

@@ -1,2 +1,2 @@
-Resource,file_name,Component,Confirmed Version
+Directory/Filename,file_name,Component,Confirmed Version
 about.py.ABOUT,about.py,ABOUT tool,0.8.1