Alex / prozorro-robot_tests · Commits

Commit a195f6f45fd55da78e78b5058c4cfe9788a627ab

Authored by alexdiatlov
Committed by GitHub
2 parents 99dd8873 d67dff48

Merge pull request #191 from ProzorroUKR/dev_prozorro 

fix data generatin/tender create
Inline Side-by-side
Showing 4 changed files with 18 additions and 10 deletions
@@ -14,6 +14,8 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status @@ -14,6 +14,8 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status
14 ${file_path}= Get Variable Value ${ARTIFACT_FILE} artifact_plan.yaml 14 ${file_path}= Get Variable Value ${ARTIFACT_FILE} artifact_plan.yaml
15 ${ARTIFACT}= load_data_from ${file_path} 15 ${ARTIFACT}= load_data_from ${file_path}
16 Log ${ARTIFACT.tender_uaid} 16 Log ${ARTIFACT.tender_uaid}
  17 + Log ${ARTIFACT.tender_id}
  18 + Log ${ARTIFACT.tender_owner_access_token}
17 ${NUMBER_OF_LOTS}= Convert To Integer ${NUMBER_OF_LOTS} 19 ${NUMBER_OF_LOTS}= Convert To Integer ${NUMBER_OF_LOTS}
18 ${NUMBER_OF_ITEMS}= Convert To Integer ${NUMBER_OF_ITEMS} 20 ${NUMBER_OF_ITEMS}= Convert To Integer ${NUMBER_OF_ITEMS}
19 ${NUMBER_OF_MILESTONES}= Convert To Integer ${NUMBER_OF_MILESTONES} 21 ${NUMBER_OF_MILESTONES}= Convert To Integer ${NUMBER_OF_MILESTONES}
@@ -42,7 +44,7 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status @@ -42,7 +44,7 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status
42 Log ${plan_data} 44 Log ${plan_data}
43 ${tender_data}= Підготувати дані для створення тендера ${tender_parameters} ${plan_data} 45 ${tender_data}= Підготувати дані для створення тендера ${tender_parameters} ${plan_data}
44 ${adapted_data}= Адаптувати дані для оголошення тендера ${tender_data} 46 ${adapted_data}= Адаптувати дані для оголошення тендера ${tender_data}
45 - ${TENDER_UAID}= Run As ${tender_owner} Створити тендер ${adapted_data} 47 + ${TENDER_UAID}= Run As ${tender_owner} Створити тендер ${adapted_data} ${ARTIFACT.tender_id} ${ARTIFACT.tender_owner_access_token}
46 Set To Dictionary ${USERS.users['${tender_owner}']} initial_data=${adapted_data} 48 Set To Dictionary ${USERS.users['${tender_owner}']} initial_data=${adapted_data}
47 Set To Dictionary ${TENDER} TENDER_UAID=${TENDER_UAID} 49 Set To Dictionary ${TENDER} TENDER_UAID=${TENDER_UAID}
48 50
@@ -189,15 +189,15 @@ Library openprocurement_client.utils @@ -189,15 +189,15 @@ Library openprocurement_client.utils
189 189
190 190
191 Створити тендер 191 Створити тендер
192 - [Arguments] ${username} ${tender_data}  
193 - ${file_path}= Get Variable Value ${ARTIFACT_FILE} artifact_plan.yaml  
194 - ${ARTIFACT}= load_data_from ${file_path}  
195 - Log ${ARTIFACT.tender_owner_access_token}  
196 - Log ${ARTIFACT.tender_id} 192 + [Arguments] ${username} ${tender_data} ${plan_id} ${plan_access_token}
  193 + #${file_path}= Get Variable Value ${ARTIFACT_FILE} artifact_plan.yaml
  194 + #${ARTIFACT}= load_data_from ${file_path}
  195 + #Log ${ARTIFACT.tender_owner_access_token}
  196 + #Log ${ARTIFACT.tender_id}
197 ${tender}= Call Method ${USERS.users['${username}'].tender_create_client} create_tender 197 ${tender}= Call Method ${USERS.users['${username}'].tender_create_client} create_tender
198 - ... ${ARTIFACT.tender_id} 198 + ... ${plan_id}
199 ... ${tender_data} 199 ... ${tender_data}
200 - ... access_token=${ARTIFACT.tender_owner_access_token} 200 + ... access_token=${plan_access_token}
201 Log ${tender} 201 Log ${tender}
202 ${access_token}= Get Variable Value ${tender.access.token} 202 ${access_token}= Get Variable Value ${tender.access.token}
203 ${status}= Set Variable If 'open' in '${MODE}' active.tendering ${EMPTY} 203 ${status}= Set Variable If 'open' in '${MODE}' active.tendering ${EMPTY}
@@ -178,6 +178,7 @@ def test_tender_data(params, @@ -178,6 +178,7 @@ def test_tender_data(params,
178 "title_en": fake_en.catch_phrase(), 178 "title_en": fake_en.catch_phrase(),
179 "title_ru": fake_ru.catch_phrase(), 179 "title_ru": fake_ru.catch_phrase(),
180 "procuringEntity": fake.procuringEntity(), 180 "procuringEntity": fake.procuringEntity(),
  181 + "procurementMethodType": "belowThreshold",
181 "value": { 182 "value": {
182 "amount": value_amount, 183 "amount": value_amount,
183 "currency": u"UAH", 184 "currency": u"UAH",
@@ -294,7 +295,11 @@ def test_tender_data_planning(params): @@ -294,7 +295,11 @@ def test_tender_data_planning(params):
294 "currency": "UAH", 295 "currency": "UAH",
295 "amount": round(random.uniform(3000, 99999999999.99), 2), 296 "amount": round(random.uniform(3000, 99999999999.99), 2),
296 "id": str(fake.random_int(min=1, max=99999999999)) + "-" + str(fake.random_int(min=1, max=9)), 297 "id": str(fake.random_int(min=1, max=99999999999)) + "-" + str(fake.random_int(min=1, max=9)),
297 - "breakdown": [] 298 + "breakdown": [],
  299 + "period": {
  300 + "startDate": get_now().replace(hour=0, minute=0, second=0, microsecond=0).isoformat(),
  301 + "endDate": get_now().replace(hour=0, minute=0, second=0, microsecond=0).isoformat()
  302 + }
298 }, 303 },
299 "procuringEntity": { 304 "procuringEntity": {
300 "identifier": { 305 "identifier": {
@@ -326,6 +326,7 @@ Get Broker Property By Username @@ -326,6 +326,7 @@ Get Broker Property By Username
326 Підготувати дані для подання пропозиції для другого етапу 326 Підготувати дані для подання пропозиції для другого етапу
327 [Arguments] ${username} 327 [Arguments] ${username}
328 ${value}= Evaluate ${USERS.users['${username}'].bidresponses.bid.data.lotValues[0].value.amount}*0.95 328 ${value}= Evaluate ${USERS.users['${username}'].bidresponses.bid.data.lotValues[0].value.amount}*0.95
  329 + ${value}= Convert To Number ${value} 2
329 Set To Dictionary ${USERS.users['${username}'].bidresponses.bid.data.lotValues[0].value} amount=${value} 330 Set To Dictionary ${USERS.users['${username}'].bidresponses.bid.data.lotValues[0].value} amount=${value}
330 [Return] ${USERS.users['${username}'].bidresponses.bid} 331 [Return] ${USERS.users['${username}'].bidresponses.bid}
331 332
@@ -1195,7 +1196,7 @@ Require Failure @@ -1195,7 +1196,7 @@ Require Failure
1195 Дочекатись можливості зареєструвати угоди 1196 Дочекатись можливості зареєструвати угоди
1196 [Arguments] ${username} 1197 [Arguments] ${username}
1197 ${username}= Отримати користувача з доступом до поля за пріорітетом contractPeriod ${tender_owner} ${viewer} 1198 ${username}= Отримати користувача з доступом до поля за пріорітетом contractPeriod ${tender_owner} ${viewer}
1198 - Дочекатись дати ${USERS.users['${tender_owner}'].tender_data.data.contractPeriod.clarificationsUntil} 1199 + Дочекатись дати ${USERS.users['${username}'].tender_data.data.contractPeriod.clarificationsUntil}
1199 Оновити LAST_MODIFICATION_DATE 1200 Оновити LAST_MODIFICATION_DATE
1200 Дочекатись синхронізації з майданчиком ${username} 1201 Дочекатись синхронізації з майданчиком ${username}
1201 1202
Please register or login to post a comment