Change variable name & delete table info not use

Change-Id: I35dff96271d4a2fbf1a6b657eff7ec2746a9cdae
Signed-off-by: Taejin Woo <tt.woo@samsung.com>

diff --git a/dtr/job_dtr_db_write.py b/dtr/job_dtr_db_write.py
index a63016a..ea6c463 100644 (file)
--- a/dtr/job_dtr_db_write.py
+++ b/dtr/job_dtr_db_write.py
@@ -42,19 +42,6 @@ def dtr_target_lookup_insert_fun(TOTAL_INFO):
 
     disconnect_db()
 
-def dtr_ver_info_fun(TOTAL_INFO, key_test_date):
-    connect_db()
-
-    query = "INSERT INTO dtr_main_info (id, test_date, tizen_release_version) VALUES(%s, %s, %s)"
-    query_var_list = []
-
-    for ver in TOTAL_INFO['tizen_version']:
-        query_var_list.append( (None, key_test_date, TOTAL_INFO[ver]) )
-
-    do_many_query(query, query_var_list)
-    pprint.pprint(do_many_query)
-
-    disconnect_db()
 
 def dtr_tbt_insert_fun(TOTAL_INFO):
     connect_db()
@@ -106,25 +93,19 @@ def dtr_unresovled_insert_fun(TOTAL_INFO):
 
     disconnect_db()
 
-def main(TOTAL_INFO):
-    key_test_date = TOTAL_INFO['test_ver_info_data']['test_date']
 
-    ## 1. DTR ver. info data (complete)
-    dtr_ver_info_fun(TOTAL_INFO['test_ver_info_data'], key_test_date, DTR_DB)
+def main(TOTAL_INFO):
 
-    ## 1. lookup table data
+    ## 1. Lookup table data
     dtr_target_lookup_insert_fun(TOTAL_INFO)
 
-    ## 3. TBT data
+    ## 3. TBT table
     dtr_tbt_insert_fun(TOTAL_INFO)
 
-    ## 4. Sample data
+    ## 4. Sample table
     dtr_sample_insert_fun(TOTAL_INFO)
 
-    ## 5. unresovled data
+    ## 5. unresovled table
     dtr_unresovled_insert_fun(TOTAL_INFO)
 
-    return 0
-
-if __name__ == "__main__":
-    sys.exit(main())
+    return 0
\ No newline at end of file

diff --git a/dtr/job_dtr_status.py b/dtr/job_dtr_status.py
index 0809971..96b7d24 100644 (file)
--- a/dtr/job_dtr_status.py
+++ b/dtr/job_dtr_status.py
@@ -30,8 +30,8 @@ import pprint
 import xlrd
 
 import job_dtr_db_writer
+import datetime
 
-from datetime import datetime
 
 #####################  1. DTR Version Info #####################
 def change_version_data(input_version):
@@ -54,7 +54,7 @@ def dtr_ver_info_export(sheet, srbd_data):
     total_results['row']           = nrow
     total_results['col']           = ncol
 
-    test_date = datetime.now()
+    test_date = datetime.datetime.now()
     total_results['test_date'] = test_date.strftime('%Y-%m-%d')
 
 
@@ -77,25 +77,25 @@ def dtr_ver_info_export(sheet, srbd_data):
         tizen_version = change_version_data("".join(total_results[url_list]))
         total_results[ver_list[index]] = tizen_version
 
-
     return total_results
 
 #####################  2. DTR Smoke Test result  #####################
-def dtr_smoke_menu_export(sheet, srbd_data):
-
+def dtr_smoke_menu_export(sheet, srbd_data, test_ver_info_dict):
     ncol = sheet.ncols
     nrow = sheet.nrows
 
     total_results = {}
-    total_results['menus'] = []
-    total_results['var_list'] = []
-    total_results['ver_list'] = []
-    total_results['env_list'] = []
-    total_results['tar_list'] = []
+    total_results['test_date'] = []
+    total_results['var_list']  = []
+    total_results['ver_list']  = []
+    total_results['env_list']  = []
+    total_results['tar_list']  = []
 
     total_results['row']          = nrow
     total_results['col']          = ncol
 
+    test_date = datetime.datetime.now()
+
     var_list = []
     ver_list = []
     env_list = []
@@ -107,7 +107,7 @@ def dtr_smoke_menu_export(sheet, srbd_data):
 
         ver_list.append(sheet.cell(1, col).value)
         total_results['ver_list'].append(ver_list[col])
-        
+
         env_list.append(sheet.cell(2, col).value)
         total_results['env_list'].append(env_list[col])
 
@@ -119,6 +119,12 @@ def dtr_smoke_menu_export(sheet, srbd_data):
         total_results[var_list[col]].append(ver_list[col])
         total_results[var_list[col]].append(env_list[col])
         total_results[var_list[col]].append(tar_list[col])
+        total_results[var_list[col]].append(test_date.strftime('%Y-%m-%d'))
+
+        if ver_list[col] in test_ver_info_dict['tizen_version']:
+            total_results[var_list[col]].append(test_ver_info_dict[ver_list[col]])
+
+#    pprint.pprint(total_results)
 
     return total_results
 
@@ -147,7 +153,6 @@ def dtr_target_lookup_DB_export(MIDDLE_INFO, arg_name):
         tizen_target          = lookup_temp_list[i*len(var_list) + 3]
         test_date             = lookup_temp_list[i*len(var_list) + 4]
         tizen_release_version = lookup_temp_list[i*len(var_list) + 5]
-
         total_results[arg_name].append( (test_info, tizen_version, tizen_environ, tizen_target, test_date, tizen_release_version) )
 
 #    pprint.pprint(total_results)
@@ -192,11 +197,11 @@ def dtr_general_menu_export(sheet, srbd_data, arg_name):
     ncol = sheet.ncols
     nrow = sheet.nrows
 
-    total_results           = {}
+    total_results = {}
     total_results[arg_name] = []
 
-    total_results['nrow']    = nrow
-    total_results['ncol']    = ncol
+    total_results['row'] = nrow
+    total_results['col'] = ncol
 
     test_date = datetime.datetime.now()
     total_results['test_date'] = test_date.strftime('%Y-%m-%d')
@@ -249,23 +254,22 @@ def main():
     unresolved_result_data = {}
 
     # complete memory
-    test_ver_menu_list     = {}
-    test_ver_info_list     = {}
+    test_ver_info_dict     = {}
 
-    smoke_menu_list        = {}
-    smoke_result_list      = {}
+    smoke_menu_dict        = {}
+    smoke_result_dict      = {}
 
-    tbt_menu_list          = {}
-    tbt_result_list        = {}
+    tbt_menu_dict          = {}
+    tbt_result_dict        = {}
 
-    sample_menu_list       = {}
-    sample_result_list     = {}
+    sample_menu_dict       = {}
+    sample_result_dict     = {}
 
-    unresolved_menu_list   = {}
-    unresolved_result_list = {}
+    unresolved_menu_dict   = {}
+    unresolved_result_dict = {}
 
     # open excel
-    excel_document = xlrd.open_workbook('Regression_Test_Result_v06_format.xlsx')
+    excel_document = xlrd.open_workbook('Daily_Regression_Test_Result_ver1_format.xlsx')
 
     # export each tab contents
     test_ver_info_sheet     = excel_document.sheet_by_name('version_info')
@@ -284,44 +288,43 @@ def main():
 
 
     ## 1. DTR test ver. data
-    test_ver_info_list      = dtr_ver_info_export(test_ver_info_sheet, test_ver_info_data)
+    test_ver_info_dict      = dtr_ver_info_export(test_ver_info_sheet, test_ver_info_data)
 
     ## 2. DTR Smoke data
-    smoke_menu_list         = dtr_smoke_menu_export(smoke_menu_sheet, smoke_menu_data)
-    smoke_result_list       = dtr_smoke_result_export(smoke_result_sheet, smoke_result_data)
+    smoke_menu_dict         = dtr_smoke_menu_export(smoke_menu_sheet, smoke_menu_data, test_ver_info_dict)
+    smoke_result_dict       = dtr_smoke_result_export(smoke_result_sheet, smoke_result_data)
 
     MIDDLE_INFO = {
         'test_ver_info_data'     :  test_ver_info_dict,
         'smoke_menu_data'        :  smoke_menu_dict,
         'smoke_result_data'      :  smoke_result_dict,
-        'smoke_menu_result_data'      :  smoke_menu_result_dict,
     }
 
     target_lookup_DB_dict   = dtr_target_lookup_DB_export(MIDDLE_INFO, "lookup_DB_values")
 
     ## 3. DTR TBT data
-    tbt_menu_list           = dtr_general_menu_export(tbt_menu_sheet, tbt_menu_data, "tbt_menus")
-    tbt_result_list         = dtr_general_result_export(tbt_result_sheet, tbt_result_data, "tbt_DB_values")
+    tbt_menu_dict           = dtr_general_menu_export(tbt_menu_sheet, tbt_menu_data, "tbt_menus")
+    tbt_result_dict         = dtr_general_result_export(tbt_result_sheet, tbt_result_data, "tbt_DB_values")
 
     ## 4. DTR sample data
-    sample_menu_list        = dtr_general_menu_export(sample_menu_sheet, sample_menu_data, "sample_menus")
-    sample_result_list      = dtr_general_result_export(sample_result_sheet, sample_result_data, "sample_DB_values")
+    sample_menu_dict        = dtr_general_menu_export(sample_menu_sheet, sample_menu_data, "sample_menus")
+    sample_result_dict      = dtr_general_result_export(sample_result_sheet, sample_result_data, "sample_DB_values")
 
     ## 5. DTR unresolved data
-    unresolved_menu_list    = dtr_general_menu_export(unresolved_menu_sheet, unresolved_menu_data, "unresolved_menus")
-    unresolved_result_list  = dtr_general_result_export(unresolved_result_sheet, unresolved_result_data, "unresolved_DB_values")
+    unresolved_menu_dict    = dtr_general_menu_export(unresolved_menu_sheet, unresolved_menu_data, "unresolved_menus")
+    unresolved_result_dict  = dtr_general_result_export(unresolved_result_sheet, unresolved_result_data, "unresolved_DB_values")
 
     TOTAL_INFO = {
-        'test_ver_info_data'     :  test_ver_info_list,
-        'smoke_menu_data'        :  smoke_menu_list,
-        'smoke_result_data'      :  smoke_result_list,
+        'test_ver_info_data'     :  test_ver_info_dict,
+        'smoke_menu_data'        :  smoke_menu_dict,
+        'smoke_result_data'      :  smoke_result_dict,
         'target_lookup_data'     :  target_lookup_DB_dict,
-        'tbt_menu_data'          :  tbt_menu_list,
-        'tbt_result_data'        :  tbt_result_list,
-        'sample_menu_data'       :  sample_menu_list,
-        'sample_result_data'     :  sample_result_list,
-        'unresolved_menu_data'   :  unresolved_menu_list,
-        'unresolved_result_data' :  unresolved_result_list,
+        'tbt_menu_data'          :  tbt_menu_dict,
+        'tbt_result_data'        :  tbt_result_dict,
+        'sample_menu_data'       :  sample_menu_dict,
+        'sample_result_data'     :  sample_result_dict,
+        'unresolved_menu_data'   :  unresolved_menu_dict,
+        'unresolved_result_data' :  unresolved_result_dict,
     }
 
 #    pprint.pprint(TOTAL_INFO)