Index: shared/scripts/configuration/config.py =================================================================== diff -u -r1899d5b5afc3e481360915302d8e2d37de8b08b8 -rf8bb098a23807b927e8081344aa556d1d179c837 --- shared/scripts/configuration/config.py (.../config.py) (revision 1899d5b5afc3e481360915302d8e2d37de8b08b8) +++ shared/scripts/configuration/config.py (.../config.py) (revision f8bb098a23807b927e8081344aa556d1d179c837) @@ -22,7 +22,7 @@ HOME_DIR_PATH = CONFIG_PATH.parent.parent.parent INP_BUF_FILE_LOCATION = "".join([str(HOME_DIR_PATH),'/Desktop/sd-card/cloudsync/']) CLOUD_CREDENTIALS_LOCATION = "".join([str(HOME_DIR_PATH)+'/Desktop/cloudsync/credentials']) - +ERROR_FILE_LOCATION = "".join([str(HOME_DIR_PATH)+'/Desktop/sd-card/log/']) PEM_FILES = ['1.pem', '2.pem', '3.pem' ] #standby mode Index: shared/scripts/configuration/utility.py =================================================================== diff -u -rc1c94ae0f22365e44259e382e0e9d417bb8c054b -rf8bb098a23807b927e8081344aa556d1d179c837 --- shared/scripts/configuration/utility.py (.../utility.py) (revision c1c94ae0f22365e44259e382e0e9d417bb8c054b) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision f8bb098a23807b927e8081344aa556d1d179c837) @@ -144,7 +144,7 @@ """ try: current_date = get_current_date_and_time(date_format = "%Y_%m_%d") - latest_file = '/home/denali/Desktop/sd-card/log/'+current_date+'_denaliSquish.log' + latest_file = config.ERROR_FILE_LOCATION+current_date+'_denaliSquish.log' return latest_file except: return False Index: tst_cloud_sync - treatment_screen/test.py =================================================================== diff -u -rc1c94ae0f22365e44259e382e0e9d417bb8c054b -rf8bb098a23807b927e8081344aa556d1d179c837 --- tst_cloud_sync - treatment_screen/test.py (.../test.py) (revision c1c94ae0f22365e44259e382e0e9d417bb8c054b) +++ tst_cloud_sync - treatment_screen/test.py (.../test.py) (revision f8bb098a23807b927e8081344aa556d1d179c837) @@ -31,55 +31,35 @@ dg_simulator = DGSimulator() hd_simulator = HDSimulator() -LOCATION = '/home/denali/Projects/application/resources/settings/Messages/Unhandled.conf' - - ERROR_MESSAGE = { -# "500" : "CS Unknown Error ", "501" : "CS Incorrect header ", "502" : "CS Incorrect timestamp ", "503" : "CS Incorrect sequence ", "504" : "CS Incorrect CRC ", "505" : "CS Incorrect ID ", "506" : "CS Invalid ID ", -# "507" : "CS Incorrect parameter count ", + "507" : "CS Incorrect parameter count ", "508" : "CS Mismatch parameter count ", "509" : "CS Missing parameter ", "510" : "CS No history available ", -# "511" : "CS Duplicate data ", -# "512" : "CS The log folder cannot be created. ", -# "513" : "CS Error writing to the input file. ", "514" : "CS The credentials file does not exist. ", -# "515" : "CS The credentials folder make failed. ", -# "516" : "CS The credentials file copy failed. ", -# "517" : "CS The credentials file remove failed. ", -# "518" : "CS The credentials folder is empty. ", -# "519" : "CS No Treatment Code provided. ", "520" : "CS The provided Treatment Code is empty. ", "521" : "CS Out buffer empty " } -# eError_Unknown_500 = "1007,1," + DEVICE_FACTORY_RESET_REQUEST_1 = '' eError_HeaderCount_501 = '1639391827,2999,3,501' eError_Timestamp_502 = '1639391ddvgvg827,1,0,2999,0,502' eError_Sequence_503 = '1639391827,dcdc1,0,2999,0,503' eError_Crc_504 = '1639391827,1,0dfd,2999,0,504' eError_MessageID_505 = '1639391827,1,0,299dfd9,0,505' eError_InvalidID_506 = '1639391827,1,0,20,0' -# eError_ParamCount_507 = '1639391827,0,1,1006,3,507,[1,1]' +eError_ParamCount_507 = '1639391827,1,0,2008,Tx_code' eError_ParamMismatch_508 = '1,1639391827,0,2999,0,508' eError_ParamMissing_509 = '1639391827,1,0,2999,3,509,[8,2]' eError_NoHistory_510 = '1639391827,1,0,2006,0' -# eErrro_Duplicate_511 = '1639391827,1,0,2999,0,511' -# eError_LogFolder_512 = '1639391827,1,0,1006,3,/tmp/credentials/dfe' -# eError_LogFileInp_513 = '1639391827,1,0,1006,3,/tmp/credentials/' eError_CredentialMake_514 = '1657706417,7,0,2003,3,,DG1234567890123,06300216' -# eError_CredentialFile_515 = '1639391827,1,0,1006,3,/tmp/credentials/' -# eError_CredentialCopy_516 = '1639391827,1,0,1006,1,3,/tmp/credentials/' -# eError_CredentialRemove_517 = '1639391827,1,0,1006,3,/tmp/credentials/' -# eError_CredentialEmpty_518 = '1639391827,1,0,1006,3,/credentials/' -# eError_TxCodeNoParam_519 = '1639391827,1,0,1006,1,[]' eError_TxCodeEmpty_520 = '1639391827,1,0,2008,1,' eError_OutFileEmpty_521 = '' @@ -136,10 +116,9 @@ def verify_error_message(): - -# set_data_in_cloud_sync_output_file(eError_Unknown_500) -# test.compare(str(verify_status(get_error_message_from_log())),ERROR_MESSAGE["500"], "message is not in unhandled.conf file. verified error message from .err file") -# utils.waitForGUI(2) + """ + This method is used to verify error message log printing inside denaliSquish.error file. + """ set_data_in_cloud_sync_output_file(eError_HeaderCount_501) utils.waitForGUI(2) @@ -165,9 +144,9 @@ utils.waitForGUI(2) test.compare(verify_status(get_error_message_from_log()),ERROR_MESSAGE["506"], "message is not in unhandled.conf file. verified error message from .err file") -# set_data_in_cloud_sync_output_file(eError_ParamCount_507) -# utils.waitForGUI(2) -# test.compare(verify_status(get_error_message_from_log()),ERROR_MESSAGE["507"], "message is not in unhandled.conf file. verified error message from .err file") + set_data_in_cloud_sync_output_file(eError_ParamCount_507) + utils.waitForGUI(2) + test.compare(verify_status(get_error_message_from_log()),ERROR_MESSAGE["507"], "message is not in unhandled.conf file. verified error message from .err file") set_data_in_cloud_sync_output_file(eError_ParamMismatch_508) utils.waitForGUI(2) @@ -180,36 +159,10 @@ set_data_in_cloud_sync_output_file(eError_NoHistory_510) utils.waitForGUI(2) test.compare(verify_status(get_error_message_from_log()),ERROR_MESSAGE["510"], "message is not in unhandled.conf file. verified error message from .err file") - -# set_data_in_cloud_sync_output_file(eErrro_Duplicate_511) -# utils.waitForGUI(2) -# test.compare(verify_status(get_error_message_from_log()),ERROR_MESSAGE["511"], "message is not in unhandled.conf file. verified error message from .err file") -# -# set_data_in_cloud_sync_output_file(eError_LogFolder_512) -# utils.waitForGUI(2) -# test.compare(verify_status(get_error_message_from_log()),ERROR_MESSAGE["512"], "message is not in unhandled.conf file. verified error message from .err file") -# set_data_in_cloud_sync_output_file(eError_LogFileInp_513) -# utils.waitForGUI(2) -# test.compare(verify_status(get_error_message_from_log()),ERROR_MESSAGE["513"], "message is not in unhandled.conf file. verified error message from .err file") - + set_data_in_cloud_sync_output_file(eError_CredentialMake_514) utils.waitForGUI(2) test.compare(verify_status(get_error_message_from_log()),ERROR_MESSAGE["514"], "message is not in unhandled.conf file. verified error message from .err file") -# set_data_in_cloud_sync_output_file(eError_CredentialFile_515) -# utils.waitForGUI(2) -# test.compare(verify_status(get_error_message_from_log()),ERROR_MESSAGE["515"], "message is not in unhandled.conf file. verified error message from .err file") -# set_data_in_cloud_sync_output_file(eError_CredentialCopy_516) -# utils.waitForGUI(2) -# test.compare(verify_status(get_error_message_from_log()),ERROR_MESSAGE["516"], "message is not in unhandled.conf file. verified error message from .err file") -# set_data_in_cloud_sync_output_file(eError_CredentialRemove_517) -# utils.waitForGUI(2) -# test.compare(verify_status(get_error_message_from_log()),ERROR_MESSAGE["517"], "message is not in unhandled.conf file. verified error message from .err file") -# set_data_in_cloud_sync_output_file(eError_CredentialEmpty_518) -# utils.waitForGUI(2) -# test.compare(verify_status(get_error_message_from_log()),ERROR_MESSAGE["518"], "message is not in unhandled.conf file. verified error message from .err file") -# set_data_in_cloud_sync_output_file(eError_TxCodeNoParam_519) -# utils.waitForGUI(2) -# test.compare(verify_status(get_error_message_from_log()),ERROR_MESSAGE["519"], "message is not in unhandled.conf file. verified error message from .err file") set_data_in_cloud_sync_output_file(eError_TxCodeEmpty_520) utils.waitForGUI(2)