Showing
3 changed files
with
11 additions
and
6 deletions
... | ... | @@ -58,7 +58,8 @@ def create_fake_doc(): |
58 | 58 | |
59 | 59 | def test_tender_data(params, |
60 | 60 | periods=("enquiry", "tender"), |
61 | - submissionMethodDetails=None): | |
61 | + submissionMethodDetails=None, | |
62 | + accelerator=None): | |
62 | 63 | submissionMethodDetails = submissionMethodDetails \ |
63 | 64 | if submissionMethodDetails else "quick" |
64 | 65 | now = get_now() |
... | ... | @@ -85,7 +86,8 @@ def test_tender_data(params, |
85 | 86 | "items": [], |
86 | 87 | "features": [] |
87 | 88 | } |
88 | - accelerator = params['intervals']['accelerator'] | |
89 | + accelerator = accelerator \ | |
90 | + if accelerator else params['intervals']['accelerator'] | |
89 | 91 | data['procurementMethodDetails'] = 'quick, ' \ |
90 | 92 | 'accelerator={}'.format(accelerator) |
91 | 93 | data["procuringEntity"]["kind"] = "other" | ... | ... |
... | ... | @@ -205,7 +205,8 @@ Get Broker Property By Username |
205 | 205 | [Arguments] ${tender_parameters} |
206 | 206 | ${period_intervals}= compute_intrs ${BROKERS} ${used_brokers} |
207 | 207 | ${submissionMethodDetails}= Get Variable Value ${submissionMethodDetails} |
208 | - ${tender_data}= prepare_test_tender_data ${period_intervals} ${tender_parameters} ${submissionMethodDetails} | |
208 | + ${accelerator}= Get Variable Value ${accelerator} | |
209 | + ${tender_data}= prepare_test_tender_data ${period_intervals} ${tender_parameters} ${submissionMethodDetails} ${accelerator} | |
209 | 210 | ${TENDER}= Create Dictionary |
210 | 211 | Set Global Variable ${TENDER} |
211 | 212 | Log ${tender_data} |
... | ... | @@ -816,7 +817,7 @@ Require Failure |
816 | 817 | Оновити LAST_MODIFICATION_DATE |
817 | 818 | Дочекатись синхронізації з майданчиком ${username} |
818 | 819 | Wait until keyword succeeds |
819 | - ... 10 min 15 sec | |
820 | + ... 40 min 15 sec | |
820 | 821 | ... 15 sec |
821 | 822 | ... Звірити статус тендера |
822 | 823 | ... ${username} | ... | ... |
... | ... | @@ -282,7 +282,8 @@ def compute_intrs(brokers_data, used_brokers): |
282 | 282 | |
283 | 283 | def prepare_test_tender_data(procedure_intervals, |
284 | 284 | tender_parameters, |
285 | - submissionMethodDetails): | |
285 | + submissionMethodDetails, | |
286 | + accelerator): | |
286 | 287 | # Get actual intervals by mode name |
287 | 288 | mode = tender_parameters['mode'] |
288 | 289 | if mode in procedure_intervals: |
... | ... | @@ -316,7 +317,8 @@ def prepare_test_tender_data(procedure_intervals, |
316 | 317 | elif mode == 'belowThreshold': |
317 | 318 | return munchify({'data': test_tender_data( |
318 | 319 | tender_parameters, |
319 | - submissionMethodDetails=submissionMethodDetails)}) | |
320 | + submissionMethodDetails=submissionMethodDetails, | |
321 | + accelerator=accelerator)}) | |
320 | 322 | # The previous line needs an explicit keyword argument because, |
321 | 323 | # unlike previous functions, this one has three arguments. |
322 | 324 | raise ValueError("Invalid mode for prepare_test_tender_data") | ... | ... |
Please
register
or
login
to post a comment