Commit b3150fa3d7a14da2906cd74eb215cfc723dd12aa
1 parent
39aa0ef0
op_client: Make calls more specific
To avoid errors when using different brokers for different roles, we need to tell Robot Framework that we want to call a keyword from a specific library/resource file.
Showing
1 changed file
with
28 additions
and
28 deletions
... | ... | @@ -54,8 +54,8 @@ Library openprocurement_client_helper.py |
54 | 54 | |
55 | 55 | Пошук тендера по ідентифікатору |
56 | 56 | [Arguments] ${username} ${tender_uaid} |
57 | - ${internalid}= Отримати internal id по UAid ${username} ${tender_uaid} | |
58 | - ${tender}= Отримати тендер ${username} ${internalid} | |
57 | + ${internalid}= openprocurement_client.Отримати internal id по UAid ${username} ${tender_uaid} | |
58 | + ${tender}= openprocurement_client.Отримати тендер ${username} ${internalid} | |
59 | 59 | [return] ${tender} |
60 | 60 | |
61 | 61 | |
... | ... | @@ -171,7 +171,7 @@ Library openprocurement_client_helper.py |
171 | 171 | Змінити цінову пропозицію |
172 | 172 | [Arguments] ${username} ${tender_uaid} ${fieldname} ${fieldvalue} |
173 | 173 | ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} |
174 | - ${bid}= Отримати пропозицію ${username} ${tender_uaid} | |
174 | + ${bid}= openprocurement_client.Отримати пропозицію ${username} ${tender_uaid} | |
175 | 175 | Set_To_Object ${bid.data} ${fieldname} ${fieldvalue} |
176 | 176 | ${tender}= set_access_key ${tender} ${USERS.users['${username}'].bidresponses['resp'].access.token} |
177 | 177 | ${changed_bid}= Call Method ${USERS.users['${username}'].client} patch_bid ${tender} ${bid} |
... | ... | @@ -191,7 +191,7 @@ Library openprocurement_client_helper.py |
191 | 191 | |
192 | 192 | Прийняти цінову пропозицію |
193 | 193 | [Arguments] ${username} ${tender_uaid} ${award} |
194 | - ${internalid}= Отримати internal id по UAid ${username} ${tender_uaid} | |
194 | + ${internalid}= openprocurement_client.Отримати internal id по UAid ${username} ${tender_uaid} | |
195 | 195 | ${tender}= Call Method ${USERS.users['${username}'].client} get_tender ${internalid} |
196 | 196 | ${tender}= set_access_key ${tender} ${USERS.users['${username}'].access_token} |
197 | 197 | ${award_activeted_response}= Call Method ${USERS.users['${username}'].client} patch_award ${tender} ${award} |
... | ... | @@ -251,7 +251,7 @@ Library openprocurement_client_helper.py |
251 | 251 | |
252 | 252 | Отримати посилання на аукціон для учасника |
253 | 253 | [Arguments] ${username} ${tender_uaid} |
254 | - ${bid}= Викликати для учасника ${username} Отримати пропозицію ${tender_uaid} | |
254 | + ${bid}= openprocurement_client.Отримати пропозицію ${username} ${tender_uaid} | |
255 | 255 | [return] ${bid.data.participationUrl} |
256 | 256 | |
257 | 257 | |
... | ... | @@ -305,7 +305,7 @@ Library openprocurement_client_helper.py |
305 | 305 | [Arguments] ${username} ${filepath} ${tender_uaid} ${lot_id} |
306 | 306 | ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} |
307 | 307 | ${tender}= set_access_key ${tender} ${USERS.users['${username}'].access_token} |
308 | - ${doc}= Завантажити документ ${username} ${filepath} ${tender_uaid} | |
308 | + ${doc}= openprocurement_client.Завантажити документ ${username} ${filepath} ${tender_uaid} | |
309 | 309 | ${lot_doc}= test_lot_document_data ${doc} ${lot_id} |
310 | 310 | ${reply}= Call Method ${USERS.users['${username}'].client} patch_document ${tender} ${lot_doc} |
311 | 311 | Log object data ${reply} reply |
... | ... | @@ -344,7 +344,7 @@ Library openprocurement_client_helper.py |
344 | 344 | |
345 | 345 | Завантажити документацію до вимоги |
346 | 346 | [Arguments] ${username} ${tender_uaid} ${claim} ${document} |
347 | - ${tender}= Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
347 | + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
348 | 348 | ${tender}= set_access_key ${tender} ${claim.access.token} |
349 | 349 | ${reply}= Call Method ${USERS.users['${username}'].client} upload_complaint_document ${document} ${tender} ${claim['data']['id']} |
350 | 350 | Log ${tender} |
... | ... | @@ -354,7 +354,7 @@ Library openprocurement_client_helper.py |
354 | 354 | Подати вимогу |
355 | 355 | [Documentation] Переводить вимогу зі статусу "draft" у статус "claim" |
356 | 356 | [Arguments] ${username} ${tender_uaid} ${claim} ${confirmation_data} |
357 | - ${tender}= Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
357 | + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
358 | 358 | ${tender}= set_access_key ${tender} ${claim.access.token} |
359 | 359 | ${reply}= Call Method ${USERS.users['${username}'].client} patch_complaint ${tender} ${confirmation_data} |
360 | 360 | Log ${tender} |
... | ... | @@ -366,7 +366,7 @@ Library openprocurement_client_helper.py |
366 | 366 | [Arguments] ${username} ${tender_uaid} ${claim} ${answer_data} |
367 | 367 | Log ${claim} |
368 | 368 | Log ${answer_data} |
369 | - ${tender}= Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
369 | + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
370 | 370 | log ${tender} |
371 | 371 | ${reply}= Call Method ${USERS.users['${username}'].client} patch_complaint ${tender} ${answer_data} |
372 | 372 | Log ${reply} |
... | ... | @@ -375,7 +375,7 @@ Library openprocurement_client_helper.py |
375 | 375 | Підтвердити вирішення вимоги |
376 | 376 | [Documentation] Переводить вимогу зі статусу "answered" у статус "resolved" |
377 | 377 | [Arguments] ${username} ${tender_uaid} ${claim} ${confirmation_data} |
378 | - ${tender}= Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
378 | + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
379 | 379 | ${tender}= set_access_key ${tender} ${claim.access.token} |
380 | 380 | ${reply}= Call Method ${USERS.users['${username}'].client} patch_complaint ${tender} ${confirmation_data} |
381 | 381 | Log ${reply} |
... | ... | @@ -384,7 +384,7 @@ Library openprocurement_client_helper.py |
384 | 384 | Скасувати вимогу |
385 | 385 | [Documentation] Переводить вимогу в статус "canceled" |
386 | 386 | [Arguments] ${username} ${tender_uaid} ${claim} ${cancellation_data} |
387 | - ${tender}= Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
387 | + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
388 | 388 | ${tender}= set_access_key ${tender} ${claim.access.token} |
389 | 389 | ${reply}= Call Method ${USERS.users['${username}'].client} patch_complaint ${tender} ${cancellation_data} |
390 | 390 | Log ${reply} |
... | ... | @@ -393,7 +393,7 @@ Library openprocurement_client_helper.py |
393 | 393 | Перетворити вимогу в скаргу |
394 | 394 | [Documentation] Переводить вимогу у статус "pending" |
395 | 395 | [Arguments] ${username} ${tender_uaid} ${claim} ${escalating_data} |
396 | - ${tender}= Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
396 | + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
397 | 397 | ${tender}= set_access_key ${tender} ${claim.access.token} |
398 | 398 | ${reply}= Call Method ${USERS.users['${username}'].client} patch_complaint ${tender} ${escalating_data} |
399 | 399 | Log ${reply} |
... | ... | @@ -408,7 +408,7 @@ Library openprocurement_client_helper.py |
408 | 408 | ... [Description] Find tender using uaid, and call upload_qualification_document |
409 | 409 | ... [Return] Reply of API |
410 | 410 | [Arguments] ${username} ${document} ${tender_uaid} ${award_num} |
411 | - ${tender}= Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
411 | + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
412 | 412 | ${doc_reply}= Call Method ${USERS.users['${username}'].client} upload_award_document ${document} ${tender} ${tender.data.awards[${award_num}].id} |
413 | 413 | Log ${doc_reply} |
414 | 414 | [Return] ${doc_reply} |
... | ... | @@ -420,7 +420,7 @@ Library openprocurement_client_helper.py |
420 | 420 | ... Find tender using uaid, get data from confirm_supplier and call patch_award |
421 | 421 | ... [Return] Nothing |
422 | 422 | [Arguments] ${username} ${tender_uaid} ${award_num} |
423 | - ${tender}= Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
423 | + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
424 | 424 | ${award}= create_data_dict data.status active |
425 | 425 | Set To Dictionary ${award.data} id ${tender.data.awards[${award_num}].id} |
426 | 426 | ${reply}= Call Method ${USERS.users['${username}'].client} patch_award ${tender} ${award} |
... | ... | @@ -464,7 +464,7 @@ Library openprocurement_client_helper.py |
464 | 464 | ... Find tender using uaid, get data from test_additional_items_data and call patch_tender |
465 | 465 | ... [Return] Nothing |
466 | 466 | [Arguments] ${username} ${tender_uaid} |
467 | - ${tender}= Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
467 | + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
468 | 468 | ${data}= test_additional_items_data ${tender['data']['id']} ${tender['access']['token']} |
469 | 469 | Log ${data} |
470 | 470 | Set To Dictionary ${USERS.users['${tender_owner}']} additional_items ${data['data']['items']} |
... | ... | @@ -478,11 +478,11 @@ Library openprocurement_client_helper.py |
478 | 478 | ... Find tender using uaid and call create_award |
479 | 479 | ... [Return] Nothing |
480 | 480 | [Arguments] ${username} ${tender_uaid} ${supplier_data} |
481 | - ${tender}= Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
481 | + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
482 | 482 | ${reply}= Call Method ${USERS.users['${username}'].client} create_award ${tender} ${supplier_data} |
483 | 483 | Log ${reply} |
484 | 484 | ${supplier_number}= Set variable 0 |
485 | - Підтвердити постачальника ${username} ${tender_uaid} ${supplier_number} | |
485 | + openprocurement_client.Підтвердити постачальника ${username} ${tender_uaid} ${supplier_number} | |
486 | 486 | |
487 | 487 | |
488 | 488 | Скасувати закупівлю |
... | ... | @@ -494,18 +494,18 @@ Library openprocurement_client_helper.py |
494 | 494 | ... After that add document to cancellation and change description of document |
495 | 495 | ... [Return] Nothing |
496 | 496 | [Arguments] ${username} ${tender_uaid} ${cancellation_reason} ${document} ${new_description} |
497 | - ${tender}= Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
497 | + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
498 | 498 | ${data}= test_cancel_tender_data ${cancellation_reason} |
499 | 499 | Log ${data} |
500 | 500 | ${cancel_reply}= Call Method ${USERS.users['${username}'].client} create_cancellation ${tender} ${data} |
501 | 501 | Log ${cancel_reply} |
502 | 502 | ${cancellation_id}= Set variable ${cancel_reply.data.id} |
503 | 503 | |
504 | - ${document_id}= Завантажити документацію до запиту на скасування ${username} ${tender_uaid} ${cancellation_id} ${document} | |
504 | + ${document_id}= openprocurement_client.Завантажити документацію до запиту на скасування ${username} ${tender_uaid} ${cancellation_id} ${document} | |
505 | 505 | |
506 | - Змінити опис документа в скасуванні ${username} ${tender_uaid} ${cancellation_id} ${document_id} ${new_description} | |
506 | + openprocurement_client.Змінити опис документа в скасуванні ${username} ${tender_uaid} ${cancellation_id} ${document_id} ${new_description} | |
507 | 507 | |
508 | - Підтвердити скасування закупівлі ${username} ${tender_uaid} ${cancellation_id} | |
508 | + openprocurement_client.Підтвердити скасування закупівлі ${username} ${tender_uaid} ${cancellation_id} | |
509 | 509 | |
510 | 510 | |
511 | 511 | Завантажити документацію до запиту на скасування |
... | ... | @@ -514,7 +514,7 @@ Library openprocurement_client_helper.py |
514 | 514 | ... [Description] Find tender using uaid, and call upload_cancellation_document |
515 | 515 | ... [Return] ID of added document |
516 | 516 | [Arguments] ${username} ${tender_uaid} ${cancellation_id} ${document} |
517 | - ${tender}= Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
517 | + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
518 | 518 | ${doc_reply}= Call Method ${USERS.users['${username}'].client} upload_cancellation_document ${document} ${tender} ${cancellation_id} |
519 | 519 | Log ${doc_reply} |
520 | 520 | [Return] ${doc_reply.data.id} |
... | ... | @@ -528,7 +528,7 @@ Library openprocurement_client_helper.py |
528 | 528 | ... [Return] Nothing |
529 | 529 | [Arguments] ${username} ${tender_uaid} ${cancellation_id} ${document_id} ${new_description} |
530 | 530 | ${field}= Set variable description |
531 | - ${tender}= Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
531 | + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
532 | 532 | ${temp}= Create Dictionary ${field} ${new_description} |
533 | 533 | ${data}= Create Dictionary data ${temp} |
534 | 534 | ${reply}= Call Method ${USERS.users['${username}'].client} patch_cancellation_document ${tender} ${data} ${cancellation_id} ${document_id} |
... | ... | @@ -541,7 +541,7 @@ Library openprocurement_client_helper.py |
541 | 541 | ... Find tender using uaid, create fake documentation and call update_cancellation_document |
542 | 542 | ... [Return] Nothing |
543 | 543 | [Arguments] ${username} ${tender_uaid} ${cancel_num} ${doc_num} |
544 | - ${tender}= Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
544 | + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
545 | 545 | ${second_cancel_doc}= create_fake_doc |
546 | 546 | Set To Dictionary ${USERS.users['${tender_owner}']} second_cancel_doc ${second_cancel_doc} |
547 | 547 | Log ${second_cancel_doc} |
... | ... | @@ -555,7 +555,7 @@ Library openprocurement_client_helper.py |
555 | 555 | ... Find tender using uaid, get cancellation test_confirmation data and call patch_cancellation |
556 | 556 | ... [Return] Nothing |
557 | 557 | [Arguments] ${username} ${tender_uaid} ${cancel_id} |
558 | - ${tender}= Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
558 | + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
559 | 559 | ${data}= test_confirm_data ${cancel_id} |
560 | 560 | Log ${data} |
561 | 561 | ${reply}= Call Method ${USERS.users['${username}'].client} patch_cancellation ${tender} ${data} |
... | ... | @@ -568,7 +568,7 @@ Library openprocurement_client_helper.py |
568 | 568 | ... Find tender using uaid, get contract test_confirmation data and call patch_contract |
569 | 569 | ... [Return] Nothing |
570 | 570 | [Arguments] ${username} ${tender_uaid} ${contract_num} |
571 | - ${tender}= Викликати для учасника ${username} Пошук тендера по ідентифікатору ${tender_uaid} | |
571 | + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
572 | 572 | ${data}= test_confirm_data ${tender['data']['contracts'][${contract_num}]['id']} |
573 | 573 | Log ${data} |
574 | 574 | ${reply}= Call Method ${USERS.users['${username}'].client} patch_contract ${tender} ${data} |
... | ... | @@ -612,7 +612,7 @@ Library openprocurement_client_helper.py |
612 | 612 | ... [Description] Find tender using uaid, and call upload_qualification_document |
613 | 613 | ... [Return] Reply of API |
614 | 614 | [Arguments] ${username} ${document} ${tender_uaid} ${qualification_num} |
615 | - ${tender}= Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
615 | + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
616 | 616 | ${doc_reply}= Call Method ${USERS.users['${username}'].client} upload_qualification_document ${document} ${tender} ${tender.data.qualifications[${qualification_num}].id} |
617 | 617 | Log ${doc_reply} |
618 | 618 | [Return] ${doc_reply} |
... | ... | @@ -640,7 +640,7 @@ Library openprocurement_client_helper.py |
640 | 640 | ... |
641 | 641 | ... [Return] Reply of API |
642 | 642 | [Arguments] ${username} ${tender_uaid} |
643 | - ${internal_id}= Отримати internal id по UAid ${username} ${tender_uaid} | |
643 | + ${internal_id}= openprocurement_client.Отримати internal id по UAid ${username} ${tender_uaid} | |
644 | 644 | ${tender}= create_data_dict data.id ${internal_id} |
645 | 645 | ${tender}= set_access_key ${tender} ${USERS.users['${username}'].access_token} |
646 | 646 | set_to_object ${tender} data.status active.pre-qualification.stand-still | ... | ... |
Please
register
or
login
to post a comment