Revision 4faa4861 qa/qa_rapi.py
| b/qa/qa_rapi.py | ||
|---|---|---|
| 233 | 233 |
rnd = random.Random(7818) |
| 234 | 234 |
|
| 235 | 235 |
for what in constants.QR_VIA_RAPI: |
| 236 |
if what == constants.QR_JOB: |
|
| 237 |
namefield = "id" |
|
| 238 |
else: |
|
| 239 |
namefield = "name" |
|
| 240 |
|
|
| 236 | 241 |
all_fields = query.ALL_FIELDS[what].keys() |
| 237 | 242 |
rnd.shuffle(all_fields) |
| 238 | 243 |
|
| ... | ... | |
| 242 | 247 |
AssertEqual(len(qresult.fields), len(all_fields)) |
| 243 | 248 |
|
| 244 | 249 |
# One field |
| 245 |
result = _rapi_client.QueryFields(what, fields=["name"])
|
|
| 250 |
result = _rapi_client.QueryFields(what, fields=[namefield])
|
|
| 246 | 251 |
qresult = objects.QueryFieldsResponse.FromDict(result) |
| 247 | 252 |
AssertEqual(len(qresult.fields), 1) |
| 248 | 253 |
|
| ... | ... | |
| 287 | 292 |
("/2/query/%s?fields=%s" % (what, ",".join(all_fields)),
|
| 288 | 293 |
compat.partial(_Check, all_fields), "GET", None), |
| 289 | 294 |
|
| 290 |
("/2/query/%s?fields=name" % what,
|
|
| 291 |
compat.partial(_Check, ["name"]), "GET", None),
|
|
| 295 |
("/2/query/%s?fields=%s" % (what, namefield),
|
|
| 296 |
compat.partial(_Check, [namefield]), "GET", None),
|
|
| 292 | 297 |
|
| 293 | 298 |
# Note the spaces |
| 294 |
("/2/query/%s?fields=name,%%20name%%09,name%%20" % what,
|
|
| 295 |
compat.partial(_Check, ["name"] * 3), "GET", None), |
|
| 299 |
("/2/query/%s?fields=%s,%%20%s%%09,%s%%20" %
|
|
| 300 |
(what, namefield, namefield, namefield), |
|
| 301 |
compat.partial(_Check, [namefield] * 3), "GET", None), |
|
| 296 | 302 |
|
| 297 | 303 |
# PUT with fields in query |
| 298 |
("/2/query/%s?fields=name" % what,
|
|
| 299 |
compat.partial(_Check, ["name"]), "PUT", {}),
|
|
| 304 |
("/2/query/%s?fields=%s" % (what, namefield),
|
|
| 305 |
compat.partial(_Check, [namefield]), "PUT", {}),
|
|
| 300 | 306 |
|
| 301 | 307 |
# Fields in body |
| 302 | 308 |
("/2/query/%s" % what, compat.partial(_Check, all_fields), "PUT", {
|
| 303 | 309 |
"fields": all_fields, |
| 304 | 310 |
}), |
| 305 | 311 |
|
| 306 |
("/2/query/%s" % what, compat.partial(_Check, ["name"] * 4), "PUT", {
|
|
| 307 |
"fields": ["name"] * 4,
|
|
| 312 |
("/2/query/%s" % what, compat.partial(_Check, [namefield] * 4), "PUT", {
|
|
| 313 |
"fields": [namefield] * 4,
|
|
| 308 | 314 |
}), |
| 309 | 315 |
]) |
| 310 | 316 |
|
| ... | ... | |
| 313 | 319 |
# With filter |
| 314 | 320 |
("/2/query/%s" % what, compat.partial(_Check, all_fields), "PUT", {
|
| 315 | 321 |
"fields": all_fields, |
| 316 |
"filter": [qlang.OP_TRUE, "name"],
|
|
| 322 |
"filter": [qlang.OP_TRUE, namefield],
|
|
| 317 | 323 |
}), |
| 318 | 324 |
]) |
| 319 | 325 |
|
Also available in: Unified diff