Merge pull request #102 from mykhaly/work_synchronisation_time_formula

Update synchronisation time formula

Merge pull request #102 from mykhaly/work_synchronisation_time_formula
Update synchronisation time formula
Myroslav Opyr
2 parents 1557f332 d01677fb
Showing 3 changed files with 59 additions and 41 deletions
op_robot_tests/tests_files/brokers/openprocurement_client.robot
op_robot_tests/tests_files/keywords.robot
op_robot_tests/tests_files/limited_keywords.robot
--- a/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @e5889dd
+++ b/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @e5889dd
@@ -13,7 +13,7 @@ Library  openprocurement_client_helper.py
   ${tenders}=  get_tenders  ${USERS.users['${username}'].client}
   Log Many  @{tenders}
   :FOR  ${tender}  IN  @{tenders}
-  \  Set To Dictionary  ${ID_MAP}  ${tender.tenderID}  ${tender.id}
+  \  Set To Dictionary  ${ID_MAP}  ${tender.tenderID}=${tender.id}
   Log Many  ${ID_MAP}
   Dictionary Should Contain Key  ${ID_MAP}  ${tender_uaid}
   Run Keyword And Return  Get From Dictionary  ${ID_MAP}  ${tender_uaid}
@@ -25,8 +25,8 @@ Library  openprocurement_client_helper.py
   Log  ${api_host_url}
   Log  ${api_version}
   ${api_wrapper}=  prepare_api_wrapper  ${USERS.users['${username}'].api_key}  ${api_host_url}  ${api_version}
-  Set To Dictionary  ${USERS.users['${username}']}  client  ${api_wrapper}
-  Set To Dictionary  ${USERS.users['${username}']}  access_token  ${EMPTY}
+  Set To Dictionary  ${USERS.users['${username}']}  client=${api_wrapper}
+  Set To Dictionary  ${USERS.users['${username}']}  access_token=${EMPTY}
   ${ID_MAP}=  Create Dictionary
   Set Suite Variable  ${ID_MAP}
   Log Variables
@@ -42,8 +42,8 @@ Library  openprocurement_client_helper.py
   ${tender}=  Call Method  ${USERS.users['${username}'].client}  create_tender  ${tender_data}
   Log object data  ${tender}  created_tender
   ${access_token}=  Get Variable Value  ${tender.access.token}
-  Set To Dictionary  ${USERS.users['${username}']}   access_token   ${access_token}
-  Set To Dictionary  ${USERS.users['${username}']}   tender_data   ${tender}
+  Set To Dictionary  ${USERS.users['${username}']}   access_token=${access_token}
+  Set To Dictionary  ${USERS.users['${username}']}   tender_data=${tender}
   Log   ${access_token}
   Log   ${tender.data.id}
   Log   ${USERS.users['${username}'].tender_data}
@@ -108,7 +108,7 @@ Library  openprocurement_client_helper.py
   Log  ${internalid}
   ${tender}=  Call Method  ${USERS.users['${username}'].client}  get_tender  ${internalid}
   ${tender}=  set_access_key  ${tender}  ${USERS.users['${username}'].access_token}
-  Set To Dictionary  ${USERS.users['${username}']}  tender_data  ${tender}
+  Set To Dictionary  ${USERS.users['${username}']}  tender_data=${tender}
   Log  ${tender}
   [Return]  ${tender}
@@ -161,7 +161,7 @@ Library  openprocurement_client_helper.py
   [Arguments]  ${username}  ${tender_uaid}  ${bid}
   ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${tender_uaid}
   ${biddingresponse}=  Call Method  ${USERS.users['${username}'].client}  create_bid  ${tender}  ${bid}
-  Set To Dictionary   ${USERS.users['${username}'].bidresponses['bid'].data}  id  ${biddingresponse['data']['id']}
+  Set To Dictionary   ${USERS.users['${username}'].bidresponses['bid'].data}  id=${biddingresponse['data']['id']}
   Log  ${biddingresponse}
   [return]  ${biddingresponse}
@@ -180,7 +180,7 @@ Library  openprocurement_client_helper.py
 Скасувати цінову пропозицію
   [Arguments]  ${username}  ${tender_uaid}  ${bid}
   ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${tender_uaid}
-  Set To Dictionary   ${bid.data}  id  ${USERS.users['${username}'].bidresponses['bid'].data.id}
+  Set To Dictionary   ${bid.data}  id=${USERS.users['${username}'].bidresponses['bid'].data.id}
   ${tender}=  set_access_key  ${tender}  ${USERS.users['${username}'].bidresponses['resp'].access.token}
   ${changed_bid}=  Call Method  ${USERS.users['${username}'].client}  delete_bid   ${tender}  ${bid}
   Log  ${changed_bid}
@@ -203,7 +203,7 @@ Library  openprocurement_client_helper.py
   ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${tender_uaid}
   ${tender}=  set_access_key  ${tender}  ${USERS.users['${username}'].bidresponses['resp'].access.token}
   ${response}=  Call Method  ${USERS.users['${username}'].client}  upload_bid_document  ${path}  ${tender}  ${bid_id}  ${doc_type}
-  ${uploaded_file} =  Create Dictionary   filepath  ${path}   upload_response  ${response}
+  ${uploaded_file} =  Create Dictionary   filepath=${path}   upload_response=${response}
   Log  ${response}
   Log object data   ${uploaded_file}
   [return]  ${uploaded_file}
@@ -214,7 +214,7 @@ Library  openprocurement_client_helper.py
   ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${TENDER['TENDER_UAID']}
   ${tender}=  set_access_key  ${tender}  ${USERS.users['${username}'].bidresponses['resp'].access.token}
   ${response}=  Call Method  ${USERS.users['${username}'].client}  update_bid_document  ${path}  ${tender}   ${bidid}   ${docid}
-  ${uploaded_file} =  Create Dictionary   filepath  ${path}   upload_response  ${response}
+  ${uploaded_file} =  Create Dictionary   filepath=${path}   upload_response=${response}
   Log  ${response}
   Log object data   ${uploaded_file}
   [return]  ${uploaded_file}
@@ -420,7 +420,7 @@ Library  openprocurement_client_helper.py
   [Arguments]  ${username}  ${tender_uaid}  ${award_num}
   ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${tender_uaid}
   ${award}=  create_data_dict  data.status  active
-  Set To Dictionary  ${award.data}  id  ${tender.data.awards[${award_num}].id}
+  Set To Dictionary  ${award.data}  id=${tender.data.awards[${award_num}].id}
   ${reply}=  Call Method  ${USERS.users['${username}'].client}  patch_award  ${tender}  ${award}
   Log  ${reply}
@@ -433,7 +433,7 @@ Library  openprocurement_client_helper.py
   [Arguments]  ${username}  ${tender_uid}  ${award_num}
   ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${tender_uid}
   ${award}=  create_data_dict   data.status  unsuccessful
-  Set To Dictionary  ${award.data}  id  ${tender.data.awards[${award_num}].id}
+  Set To Dictionary  ${award.data}  id=${tender.data.awards[${award_num}].id}
   ${reply}=  Call Method  ${USERS.users['${username}'].client}  patch_award  ${tender}  ${award}
   Log  ${reply}
   [Return]  ${reply}
@@ -447,7 +447,7 @@ Library  openprocurement_client_helper.py
   [Arguments]  ${username}  ${tender_uid}  ${award_num}
   ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${tender_uid}
   ${award}=  create_data_dict   data.status  cancelled
-  Set To Dictionary  ${award.data}  id  ${tender.data.awards[${award_num}].id}
+  Set To Dictionary  ${award.data}  id=${tender.data.awards[${award_num}].id}
   ${reply}=  Call Method  ${USERS.users['${username}'].client}  patch_award  ${tender}  ${award}
   Log  ${reply}
   [Return]  ${reply}
@@ -465,7 +465,7 @@ Library  openprocurement_client_helper.py
   ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${tender_uaid}
   ${data}=  test_additional_items_data  ${tender['data']['id']}  ${tender['access']['token']}
   Log  ${data}
-  Set To Dictionary  ${USERS.users['${tender_owner}']}  additional_items  ${data['data']['items']}
+  Set To Dictionary  ${USERS.users['${tender_owner}']}  additional_items=${data['data']['items']}
   ${reply}=  Call Method  ${USERS.users['${username}'].client}  patch_tender  ${data}
   Log  ${reply}
@@ -527,8 +527,8 @@ Library  openprocurement_client_helper.py
   [Arguments]  ${username}  ${tender_uaid}  ${cancellation_id}  ${document_id}  ${new_description}
   ${field}=  Set variable  description
   ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${tender_uaid}
-  ${temp}=  Create Dictionary  ${field}  ${new_description}
-  ${data}=  Create Dictionary  data  ${temp}
+  ${temp}=  Create Dictionary  ${field}=${new_description}
+  ${data}=  Create Dictionary  data=${temp}
   ${reply}=  Call Method  ${USERS.users['${username}'].client}  patch_cancellation_document  ${tender}  ${data}  ${cancellation_id}  ${document_id}
   Log  ${reply}
@@ -541,7 +541,7 @@ Library  openprocurement_client_helper.py
   [Arguments]  ${username}  ${tender_uaid}  ${cancel_num}  ${doc_num}
   ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${tender_uaid}
   ${second_cancel_doc}=  create_fake_doc
-  Set To Dictionary  ${USERS.users['${tender_owner}']}  second_cancel_doc  ${second_cancel_doc}
+  Set To Dictionary  ${USERS.users['${tender_owner}']}  second_cancel_doc=${second_cancel_doc}
   Log  ${second_cancel_doc}
   ${reply}=  Call Method  ${USERS.users['${username}'].client}  update_cancellation_document  ${second_cancel_doc}  ${tender}  ${tender['data']['cancellations'][${cancel_num}]['id']}  ${tender['data']['cancellations'][${cancel_num}]['documents'][${doc_num}]['id']}
   Log  ${reply}
@@ -584,7 +584,7 @@ Library  openprocurement_client_helper.py
   [Arguments]  ${username}  ${tender_uid}  ${qualification_num}
   ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${tender_uid}
   ${qualification}=  create_data_dict   data.status  active
-  Set To Dictionary  ${qualification.data}  id  ${tender.data.qualifications[${qualification_num}].id}
+  Set To Dictionary  ${qualification.data}  id=${tender.data.qualifications[${qualification_num}].id}
   ${reply}=  Call Method  ${USERS.users['${username}'].client}  patch_qualification  ${tender}  ${qualification}
   Log  ${reply}
   [Return]  ${reply}
@@ -598,7 +598,7 @@ Library  openprocurement_client_helper.py
   [Arguments]  ${username}  ${tender_uid}  ${qualification_num}
   ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${tender_uid}
   ${qualification}=  create_data_dict   data.status  unsuccessful
-  Set To Dictionary  ${qualification.data}  id  ${tender.data.qualifications[${qualification_num}].id}
+  Set To Dictionary  ${qualification.data}  id=${tender.data.qualifications[${qualification_num}].id}
   ${reply}=  Call Method  ${USERS.users['${username}'].client}  patch_qualification  ${tender}  ${qualification}
   Log  ${reply}
   [Return]  ${reply}
@@ -624,7 +624,7 @@ Library  openprocurement_client_helper.py
   [Arguments]  ${username}  ${tender_uid}  ${qualification_num}
   ${tender}=  openprocurement_client.Пошук тендера по ідентифікатору  ${username}  ${tender_uid}
   ${qualification}=  create_data_dict   data.status  cancelled
-  Set To Dictionary  ${qualification.data}  id  ${tender.data.qualifications[${qualification_num}].id}
+  Set To Dictionary  ${qualification.data}  id=${tender.data.qualifications[${qualification_num}].id}
   ${reply}=  Call Method  ${USERS.users['${username}'].client}  patch_qualification  ${tender}  ${qualification}
   Log  ${reply}
   [Return]  ${reply}
--- a/op_robot_tests/tests_files/keywords.robot
View file @e5889dd
+++ b/op_robot_tests/tests_files/keywords.robot
View file @e5889dd
@@ -183,13 +183,15 @@ Get Broker Property By Username
 Дочекатись синхронізації з майданчиком
   [Arguments]  ${username}
   [Documentation]
-  ...      Find out how much time has passed since the procurement was modified
-  ...      and store the result in `delta`,
-  ...      then get `timeout_on_wait` for ``username``,
-  ...      then wait for `sleep` seconds, where:
-  ...
-  ...      sleep = timeout_on_wait - delta
-  ...
+  ...      Synchronise with ``username`` and update cache
+  ...      First section
+  ...      Get `timeout_on_wait` for ``username``
+  ...      Add `timeout_on_wait` to `last_modification_date` in order to have
+  ...      correct time of data modification in CDB(every broker has different
+  ...      data synchronisation time with CDB).
+  ...      Find diff between `last_mofidication_date_corrected`
+  ...      and `now`. If that value is positive, sleep for `sleep` seconds,
+  ...      else go to next section.
   ...      Thus, when this keyword is executed several times in a row,
   ...      it will wait for as long as really needed.
   ...
@@ -212,18 +214,34 @@ Get Broker Property By Username
   ...      First call will trigger `Sleep 115`.
   ...      Second call will trigger `Sleep 0`,
   ...      since we have already slept for 120 seconds
-  ...      and there is no need to sleep any longer.
-  ${now}=  Get Current TZdate
-  ${delta}=  Subtract Date From Date  ${now}  ${TENDER['LAST_MODIFICATION_DATE']}
+  ...      and there is no need to sleep anymore.
+  ...
+  ...      Second section
+  ...      Find how much time passed from ``username``'s `last_refresh_date`
+  ...      to `last_modification_date_corrected`. If that value is positive, then
+  ...      cahce for ``username`` is not up-to-date. So, it will be refreshed and
+  ...      `last_refresh_date` will be updated.
+  ...      Else do nothing.
   ${timeout_on_wait}=  Get Broker Property By Username  ${username}  timeout_on_wait
-  ${sleep}=  Subtract Time From Time  ${timeout_on_wait}  ${delta}
+  ${last_modification_date_corrected}=  Add Time To Date
+  ...      ${TENDER['LAST_MODIFICATION_DATE']}
+  ...      ${timeout_on_wait} s
+  ${now}=  Get Current TZdate
+  ${sleep}=  Subtract Date From Date
+  ...      ${last_modification_date_corrected}
+  ...      ${now}
   Run Keyword If  ${sleep} > 0  Sleep  ${sleep}
-  ${last_modification_date_corrected}=  Add Time To Date  ${TENDER['LAST_MODIFICATION_DATE']}  ${timeout_on_wait} s
-  ${time_diff}=  Subtract Date From Date  ${last_modification_date_corrected}  ${USERS.users['${username}']['LAST_REFRESH_DATE']}
-  Run Keyword If  ${time_diff} > 0  Викликати для учасника  ${username}  Оновити сторінку з тендером  ${TENDER['TENDER_UAID']}
+
+  ${time_diff}=  Subtract Date From Date
+  ...      ${last_modification_date_corrected}
+  ...      ${USERS.users['${username}']['LAST_REFRESH_DATE']}
   ${LAST_REFRESH_DATE}=  Get Current TZdate
-  Run Keyword If  ${time_diff} > 0  Set To Dictionary  ${USERS.users['${username}']}  LAST_REFRESH_DATE=${LAST_REFRESH_DATE}
+  Run Keyword If  ${time_diff} > 0  Run keywords
+  ...      Викликати для учасника  ${username}  Оновити сторінку з тендером  ${TENDER['TENDER_UAID']}
+  ...      AND
+  ...      Set To Dictionary  ${USERS.users['${username}']}  LAST_REFRESH_DATE=${LAST_REFRESH_DATE}
+
 Звірити поле тендера
   [Arguments]  ${username}  ${tender_data}  ${field}
--- a/op_robot_tests/tests_files/limited_keywords.robot
View file @e5889dd
+++ b/op_robot_tests/tests_files/limited_keywords.robot
View file @e5889dd
@@ -14,8 +14,8 @@ Resource           resource.robot
   ...      Створити тендер
   ...      ${tender_data}
   Log  ${tender_data}
-  Set To Dictionary  ${TENDER}  TENDER_UAID  ${TENDER_UAID}
-  Set To Dictionary  ${USERS.users['${tender_owner}']}  initial_data  ${tender_data}
+  Set To Dictionary  ${TENDER}  TENDER_UAID=${TENDER_UAID}
+  Set To Dictionary  ${USERS.users['${tender_owner}']}  initial_data=${tender_data}
   Log  ${TENDER}
@@ -66,8 +66,8 @@ Resource           resource.robot
   ...      Створити тендер
   ...      ${tender_data}
   Log  ${tender_data}
-  Set To Dictionary  ${TENDER}  TENDER_UAID  ${TENDER_UAID}
-  Set To Dictionary  ${USERS.users['${tender_owner}']}  initial_data  ${tender_data}
+  Set To Dictionary  ${TENDER}  TENDER_UAID=${TENDER_UAID}
+  Set To Dictionary  ${USERS.users['${tender_owner}']}  initial_data=${tender_data}
   Log  ${TENDER}
@@ -89,8 +89,8 @@ Resource           resource.robot
   ...      Завантажити документ
   ...      ${filepath}
   ...      ${TENDER['TENDER_UAID']}
-  ${documents}=  Create Dictionary  filepath  ${filepath}
-  Set To Dictionary  ${USERS.users['${tender_owner}']}  documents  ${documents}
+  ${documents}=  Create Dictionary  filepath=${filepath}
+  Set To Dictionary  ${USERS.users['${tender_owner}']}  documents=${documents}
 Можливість зареєструвати і підтвердити постачальника до закупівлі