Alex / prozorro-robot_tests · Commits

Commit 5d06cd489292510a22704b385038b3705a186588

Authored by AlexDiatlov
1 parent fc44e8b6

pass tender_uaid into create_tender for brokers

Inline Side-by-side
Showing 2 changed files with 12 additions and 22 deletions
@@ -14,8 +14,6 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status @@ -14,8 +14,6 @@ ${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}  
19 ${NUMBER_OF_LOTS}= Convert To Integer ${NUMBER_OF_LOTS} 17 ${NUMBER_OF_LOTS}= Convert To Integer ${NUMBER_OF_LOTS}
20 ${NUMBER_OF_ITEMS}= Convert To Integer ${NUMBER_OF_ITEMS} 18 ${NUMBER_OF_ITEMS}= Convert To Integer ${NUMBER_OF_ITEMS}
21 ${NUMBER_OF_MILESTONES}= Convert To Integer ${NUMBER_OF_MILESTONES} 19 ${NUMBER_OF_MILESTONES}= Convert To Integer ${NUMBER_OF_MILESTONES}
@@ -44,7 +42,7 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status @@ -44,7 +42,7 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status
44 Log ${plan_data} 42 Log ${plan_data}
45 ${tender_data}= Підготувати дані для створення тендера ${tender_parameters} ${plan_data} 43 ${tender_data}= Підготувати дані для створення тендера ${tender_parameters} ${plan_data}
46 ${adapted_data}= Адаптувати дані для оголошення тендера ${tender_data} 44 ${adapted_data}= Адаптувати дані для оголошення тендера ${tender_data}
47 - ${TENDER_UAID}= Run As ${tender_owner} Створити тендер ${adapted_data} ${ARTIFACT.tender_id} ${ARTIFACT.tender_owner_access_token} 45 + ${TENDER_UAID}= Run As ${tender_owner} Створити тендер ${adapted_data} ${ARTIFACT.tender_uaid}
48 Set To Dictionary ${USERS.users['${tender_owner}']} initial_data=${adapted_data} 46 Set To Dictionary ${USERS.users['${tender_owner}']} initial_data=${adapted_data}
49 Set To Dictionary ${TENDER} TENDER_UAID=${TENDER_UAID} 47 Set To Dictionary ${TENDER} TENDER_UAID=${TENDER_UAID}
50 48
@@ -78,8 +76,6 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status @@ -78,8 +76,6 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status
78 ${file_path}= Get Variable Value ${ARTIFACT_FILE} artifact_plan.yaml 76 ${file_path}= Get Variable Value ${ARTIFACT_FILE} artifact_plan.yaml
79 ${ARTIFACT}= load_data_from ${file_path} 77 ${ARTIFACT}= load_data_from ${file_path}
80 Log ${ARTIFACT.tender_uaid} 78 Log ${ARTIFACT.tender_uaid}
81 - Log ${ARTIFACT.tender_id}  
82 - Log ${ARTIFACT.tender_owner_access_token}  
83 [Arguments] ${data_version} 79 [Arguments] ${data_version}
84 ${NUMBER_OF_LOTS}= Convert To Integer ${NUMBER_OF_LOTS} 80 ${NUMBER_OF_LOTS}= Convert To Integer ${NUMBER_OF_LOTS}
85 ${NUMBER_OF_ITEMS}= Convert To Integer ${NUMBER_OF_ITEMS} 81 ${NUMBER_OF_ITEMS}= Convert To Integer ${NUMBER_OF_ITEMS}
@@ -107,7 +103,7 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status @@ -107,7 +103,7 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status
107 ${adapted_data}= Адаптувати дані для оголошення тендера ${tender_data} 103 ${adapted_data}= Адаптувати дані для оголошення тендера ${tender_data}
108 ${adapted_data_mnn}= edit_tender_data_for_mnn ${adapted_data} ${MODE} ${data_version} 104 ${adapted_data_mnn}= edit_tender_data_for_mnn ${adapted_data} ${MODE} ${data_version}
109 Log ${adapted_data_mnn} 105 Log ${adapted_data_mnn}
110 - ${TENDER_UAID}= Run As ${tender_owner} Створити тендер ${adapted_data_mnn} ${ARTIFACT.tender_id} ${ARTIFACT.tender_owner_access_token} 106 + ${TENDER_UAID}= Run As ${tender_owner} Створити тендер ${adapted_data_mnn} ${ARTIFACT.tender_uaid}
111 Set To Dictionary ${USERS.users['${tender_owner}']} initial_data=${adapted_data_mnn} 107 Set To Dictionary ${USERS.users['${tender_owner}']} initial_data=${adapted_data_mnn}
112 Set To Dictionary ${TENDER} TENDER_UAID=${TENDER_UAID} 108 Set To Dictionary ${TENDER} TENDER_UAID=${TENDER_UAID}
113 109
@@ -117,8 +113,6 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status @@ -117,8 +113,6 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status
117 ${file_path}= Get Variable Value ${ARTIFACT_FILE} artifact_plan.yaml 113 ${file_path}= Get Variable Value ${ARTIFACT_FILE} artifact_plan.yaml
118 ${ARTIFACT}= load_data_from ${file_path} 114 ${ARTIFACT}= load_data_from ${file_path}
119 Log ${ARTIFACT.tender_uaid} 115 Log ${ARTIFACT.tender_uaid}
120 - Log ${ARTIFACT.tender_id}  
121 - Log ${ARTIFACT.tender_owner_access_token}  
122 ${NUMBER_OF_LOTS}= Convert To Integer ${NUMBER_OF_LOTS} 116 ${NUMBER_OF_LOTS}= Convert To Integer ${NUMBER_OF_LOTS}
123 ${NUMBER_OF_ITEMS}= Convert To Integer ${NUMBER_OF_ITEMS} 117 ${NUMBER_OF_ITEMS}= Convert To Integer ${NUMBER_OF_ITEMS}
124 ${NUMBER_OF_MILESTONES}= Convert To Integer ${NUMBER_OF_MILESTONES} 118 ${NUMBER_OF_MILESTONES}= Convert To Integer ${NUMBER_OF_MILESTONES}
@@ -145,7 +139,7 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status @@ -145,7 +139,7 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status
145 ${adapted_data}= Адаптувати дані для оголошення тендера ${tender_data} 139 ${adapted_data}= Адаптувати дані для оголошення тендера ${tender_data}
146 ${adapted_data_cost}= edit_tender_data_for_cost ${adapted_data} ${MODE} ${data_version} 140 ${adapted_data_cost}= edit_tender_data_for_cost ${adapted_data} ${MODE} ${data_version}
147 Log ${adapted_data_cost} 141 Log ${adapted_data_cost}
148 - ${TENDER_UAID}= Run As ${tender_owner} Створити тендер ${adapted_data_cost} ${ARTIFACT.tender_id} ${ARTIFACT.tender_owner_access_token} 142 + ${TENDER_UAID}= Run As ${tender_owner} Створити тендер ${adapted_data_cost} ${ARTIFACT.tender_uaid}
149 Set To Dictionary ${USERS.users['${tender_owner}']} initial_data=${adapted_data_cost} 143 Set To Dictionary ${USERS.users['${tender_owner}']} initial_data=${adapted_data_cost}
150 Set To Dictionary ${TENDER} TENDER_UAID=${TENDER_UAID} 144 Set To Dictionary ${TENDER} TENDER_UAID=${TENDER_UAID}
151 145
@@ -155,8 +149,6 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status @@ -155,8 +149,6 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status
155 ${file_path}= Get Variable Value ${ARTIFACT_FILE} artifact_plan.yaml 149 ${file_path}= Get Variable Value ${ARTIFACT_FILE} artifact_plan.yaml
156 ${ARTIFACT}= load_data_from ${file_path} 150 ${ARTIFACT}= load_data_from ${file_path}
157 Log ${ARTIFACT.tender_uaid} 151 Log ${ARTIFACT.tender_uaid}
158 - Log ${ARTIFACT.tender_id}  
159 - Log ${ARTIFACT.tender_owner_access_token}  
160 ${NUMBER_OF_LOTS}= Convert To Integer ${NUMBER_OF_LOTS} 152 ${NUMBER_OF_LOTS}= Convert To Integer ${NUMBER_OF_LOTS}
161 ${NUMBER_OF_ITEMS}= Convert To Integer ${NUMBER_OF_ITEMS} 153 ${NUMBER_OF_ITEMS}= Convert To Integer ${NUMBER_OF_ITEMS}
162 ${NUMBER_OF_MILESTONES}= Convert To Integer ${NUMBER_OF_MILESTONES} 154 ${NUMBER_OF_MILESTONES}= Convert To Integer ${NUMBER_OF_MILESTONES}
@@ -183,7 +175,7 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status @@ -183,7 +175,7 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status
183 ${adapted_data}= Адаптувати дані для оголошення тендера ${tender_data} 175 ${adapted_data}= Адаптувати дані для оголошення тендера ${tender_data}
184 ${adapted_data_gmdn}= edit_tender_data_for_gmdn ${adapted_data} ${MODE} ${data_version} 176 ${adapted_data_gmdn}= edit_tender_data_for_gmdn ${adapted_data} ${MODE} ${data_version}
185 Log ${adapted_data_gmdn} 177 Log ${adapted_data_gmdn}
186 - ${TENDER_UAID}= Run As ${tender_owner} Створити тендер ${adapted_data_gmdn} ${ARTIFACT.tender_id} ${ARTIFACT.tender_owner_access_token} 178 + ${TENDER_UAID}= Run As ${tender_owner} Створити тендер ${adapted_data_gmdn} ${ARTIFACT.tender_uaid}
187 Set To Dictionary ${USERS.users['${tender_owner}']} initial_data=${adapted_data_gmdn} 179 Set To Dictionary ${USERS.users['${tender_owner}']} initial_data=${adapted_data_gmdn}
188 Set To Dictionary ${TENDER} TENDER_UAID=${TENDER_UAID} 180 Set To Dictionary ${TENDER} TENDER_UAID=${TENDER_UAID}
189 181
@@ -193,8 +185,6 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status @@ -193,8 +185,6 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status
193 ${file_path}= Get Variable Value ${ARTIFACT_FILE} artifact_plan.yaml 185 ${file_path}= Get Variable Value ${ARTIFACT_FILE} artifact_plan.yaml
194 ${ARTIFACT}= load_data_from ${file_path} 186 ${ARTIFACT}= load_data_from ${file_path}
195 Log ${ARTIFACT.tender_uaid} 187 Log ${ARTIFACT.tender_uaid}
196 - Log ${ARTIFACT.tender_id}  
197 - Log ${ARTIFACT.tender_owner_access_token}  
198 ${NUMBER_OF_LOTS}= Convert To Integer ${NUMBER_OF_LOTS} 188 ${NUMBER_OF_LOTS}= Convert To Integer ${NUMBER_OF_LOTS}
199 ${NUMBER_OF_ITEMS}= Convert To Integer ${NUMBER_OF_ITEMS} 189 ${NUMBER_OF_ITEMS}= Convert To Integer ${NUMBER_OF_ITEMS}
200 ${NUMBER_OF_MILESTONES}= Convert To Integer ${NUMBER_OF_MILESTONES} 190 ${NUMBER_OF_MILESTONES}= Convert To Integer ${NUMBER_OF_MILESTONES}
@@ -221,7 +211,7 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status @@ -221,7 +211,7 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status
221 ${adapted_data}= Адаптувати дані для оголошення тендера ${tender_data} 211 ${adapted_data}= Адаптувати дані для оголошення тендера ${tender_data}
222 ${adapted_data_plan_tender}= edit_tender_data_for_plan_tender ${adapted_data} ${MODE} ${data_version} 212 ${adapted_data_plan_tender}= edit_tender_data_for_plan_tender ${adapted_data} ${MODE} ${data_version}
223 Log ${adapted_data_plan_tender} 213 Log ${adapted_data_plan_tender}
224 - ${TENDER_UAID}= Run As ${tender_owner} Створити тендер ${adapted_data_plan_tender} ${ARTIFACT.tender_id} ${ARTIFACT.tender_owner_access_token} 214 + ${TENDER_UAID}= Run As ${tender_owner} Створити тендер ${adapted_data_plan_tender} ${ARTIFACT.tender_uaid}
225 Set To Dictionary ${USERS.users['${tender_owner}']} initial_data=${adapted_data_plan_tender} 215 Set To Dictionary ${USERS.users['${tender_owner}']} initial_data=${adapted_data_plan_tender}
226 Set To Dictionary ${TENDER} TENDER_UAID=${TENDER_UAID} 216 Set To Dictionary ${TENDER} TENDER_UAID=${TENDER_UAID}
227 217
@@ -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} ${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} 192 + [Arguments] ${username} ${tender_data} ${plan_uaid}
  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 - ... ${plan_id} 198 + ... ${ARTIFACT.tender_id}
199 ... ${tender_data} 199 ... ${tender_data}
200 - ... access_token=${plan_access_token} 200 + ... access_token=${ARTIFACT.tender_owner_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}
Please register or login to post a comment