Commit aa404ab4b3fe7bdb4410ade2f2b0d5e34d6626e5
Committed by
mykhaly
1 parent
b73672cc
Delete crutch from `Run As` keyword
Showing
1 changed file
with
3 additions
and
8 deletions
| @@ -267,7 +267,7 @@ Get Broker Property By Username | @@ -267,7 +267,7 @@ Get Broker Property By Username | ||
| 267 | [Arguments] ${username} ${tender_data} | 267 | [Arguments] ${username} ${tender_data} |
| 268 | # munchify is used to make deep copy of ${tender_data} | 268 | # munchify is used to make deep copy of ${tender_data} |
| 269 | ${tender_data_copy}= munchify ${tender_data} | 269 | ${tender_data_copy}= munchify ${tender_data} |
| 270 | - ${status} ${adapted_data}= Run Keyword And Ignore Error Викликати для учасника ${username} Підготувати дані для оголошення тендера ${tender_data_copy} | 270 | + ${status} ${adapted_data}= Run Keyword And Ignore Error Run As ${username} Підготувати дані для оголошення тендера ${tender_data_copy} |
| 271 | ${adapted_data}= Set variable if '${status}' == 'FAIL' ${tender_data_copy} ${adapted_data} | 271 | ${adapted_data}= Set variable if '${status}' == 'FAIL' ${tender_data_copy} ${adapted_data} |
| 272 | # munchify is used to make nice log output | 272 | # munchify is used to make nice log output |
| 273 | ${adapted_data}= munchify ${adapted_data} | 273 | ${adapted_data}= munchify ${adapted_data} |
| @@ -357,7 +357,7 @@ Get Broker Property By Username | @@ -357,7 +357,7 @@ Get Broker Property By Username | ||
| 357 | ... ${USERS.users['${username}']['LAST_REFRESH_DATE']} | 357 | ... ${USERS.users['${username}']['LAST_REFRESH_DATE']} |
| 358 | ${LAST_REFRESH_DATE}= Get Current TZdate | 358 | ${LAST_REFRESH_DATE}= Get Current TZdate |
| 359 | Run Keyword If ${time_diff} > 0 Run keywords | 359 | Run Keyword If ${time_diff} > 0 Run keywords |
| 360 | - ... Викликати для учасника ${username} Оновити сторінку з тендером ${TENDER['TENDER_UAID']} | 360 | + ... Run As ${username} Оновити сторінку з тендером ${TENDER['TENDER_UAID']} |
| 361 | ... AND | 361 | ... AND |
| 362 | ... Set To Dictionary ${USERS.users['${username}']} LAST_REFRESH_DATE=${LAST_REFRESH_DATE} | 362 | ... Set To Dictionary ${USERS.users['${username}']} LAST_REFRESH_DATE=${LAST_REFRESH_DATE} |
| 363 | 363 | ||
| @@ -563,12 +563,7 @@ Run As | @@ -563,12 +563,7 @@ Run As | ||
| 563 | Log ${command} | 563 | Log ${command} |
| 564 | Log Many @{arguments} | 564 | Log Many @{arguments} |
| 565 | ${keywords_file}= Get Broker Property By Username ${username} keywords_file | 565 | ${keywords_file}= Get Broker Property By Username ${username} keywords_file |
| 566 | - ${status} ${value}= Run keyword and ignore keyword definitions ${keywords_file}.${command} ${username} @{arguments} | ||
| 567 | - ${unexpected_args}= Get Regexp Matches '${value}' expected [0-9] arguments, got [0-9] | ||
| 568 | - ${status} ${value}= Run Keyword If "${unexpected_args}"=="[]" Set Variable ${status} ${value} | ||
| 569 | - ... ELSE Run keyword and ignore keyword definitions ${keywords_file}.${command} ${username} @{arguments[:-1]} | ||
| 570 | - Run Keyword If '${status}' == 'FAIL' Fail ${value} | ||
| 571 | - [return] ${value} | 566 | + Run Keyword And Return ${keywords_file}.${command} ${username} @{arguments} |
| 572 | 567 | ||
| 573 | 568 | ||
| 574 | Require Failure | 569 | Require Failure |
Please
register
or
login
to post a comment