Commit 9541bf845725e2673b475f38f8c6891c1d175763

Authored by selurvedu
1 parent aaae17fc

Apply custom interval values on top of defaults

@@ -84,7 +84,9 @@ Get Broker Property By Username @@ -84,7 +84,9 @@ Get Broker Property By Username
84 ${reply}= test_complaint_reply_data 84 ${reply}= test_complaint_reply_data
85 Append to list ${REPLIES} ${reply} 85 Append to list ${REPLIES} ${reply}
86 Set Global Variable @{REPLIES} 86 Set Global Variable @{REPLIES}
87 - ${period_intervals}= Get Broker Property By Username ${tender_owner} intervals 87 + ${custom_intervals}= Get Broker Property By Username ${tender_owner} intervals
  88 + ${default_intervals}= Get Broker Property Default intervals
  89 + ${period_intervals}= merge_dicts ${default_intervals} ${custom_intervals}
88 ${tender_data}= prepare_test_tender_data ${period_intervals} ${mode} 90 ${tender_data}= prepare_test_tender_data ${period_intervals} ${mode}
89 ${TENDER}= Create Dictionary 91 ${TENDER}= Create Dictionary
90 Set Global Variable ${TENDER} 92 Set Global Variable ${TENDER}
@@ -180,6 +180,13 @@ def wait_to_date(date_stamp): @@ -180,6 +180,13 @@ def wait_to_date(date_stamp):
180 return wait_seconds 180 return wait_seconds
181 181
182 182
  183 +def merge_dicts(left, right):
  184 + new = {}
  185 + new.update(left)
  186 + new.update(right)
  187 + return new
  188 +
  189 +
183 # GUI Frontends common 190 # GUI Frontends common
184 def add_data_for_gui_frontends(tender_data): 191 def add_data_for_gui_frontends(tender_data):
185 now = datetime.now() 192 now = datetime.now()
Please register or login to post a comment