Revision a6070ef7 test/ganeti.cli_unittest.py

b/test/ganeti.cli_unittest.py
379 379
                                   kind=constants.QFT_BOOL),
380 380
      objects.QueryFieldDefinition(name="nodata", title="NoData",
381 381
                                   kind=constants.QFT_TEXT),
382
      objects.QueryFieldDefinition(name="offline", title="OffLine",
383
                                   kind=constants.QFT_TEXT),
382 384
      ]
383 385

  
384 386
    response = objects.QueryResponse(fields=fields, data=[
385 387
      [(constants.QRFS_NORMAL, 1), (constants.QRFS_UNKNOWN, None),
386
       (constants.QRFS_NORMAL, False), (constants.QRFS_NORMAL, "")],
388
       (constants.QRFS_NORMAL, False), (constants.QRFS_NORMAL, ""),
389
       (constants.QRFS_OFFLINE, None)],
387 390
      [(constants.QRFS_NORMAL, 2), (constants.QRFS_UNKNOWN, None),
388
       (constants.QRFS_NODATA, None), (constants.QRFS_NORMAL, "x")],
391
       (constants.QRFS_NODATA, None), (constants.QRFS_NORMAL, "x"),
392
       (constants.QRFS_OFFLINE, None)],
389 393
      [(constants.QRFS_NORMAL, 3), (constants.QRFS_UNKNOWN, None),
390
       (constants.QRFS_NORMAL, False), (constants.QRFS_UNAVAIL, None)],
394
       (constants.QRFS_NORMAL, False), (constants.QRFS_UNAVAIL, None),
395
       (constants.QRFS_OFFLINE, None)],
391 396
      ])
392 397

  
393 398
    self.assertEqual(cli.FormatQueryResult(response, header=True,
394 399
                                           separator="|"),
395 400
      (cli.QR_UNKNOWN, [
396
      "ID|unk|Unavail|NoData",
397
      "1|(unknown)|N|",
398
      "2|(unknown)|(nodata)|x",
399
      "3|(unknown)|N|(unavail)",
401
      "ID|unk|Unavail|NoData|OffLine",
402
      "1|(unknown)|N||(offline)",
403
      "2|(unknown)|(nodata)|x|(offline)",
404
      "3|(unknown)|N|(unavail)|(offline)",
400 405
      ]))
401 406

  
402 407
  def testNoData(self):
......
433 438
                                   kind=constants.QFT_BOOL),
434 439
      objects.QueryFieldDefinition(name="nodata", title="NoData",
435 440
                                   kind=constants.QFT_TEXT),
441
      objects.QueryFieldDefinition(name="offline", title="OffLine",
442
                                   kind=constants.QFT_TEXT),
436 443
      ]
437 444

  
438 445
    response = objects.QueryResponse(fields=fields, data=[
439 446
      [(constants.QRFS_NORMAL, 1), (constants.QRFS_NORMAL, False),
440
       (constants.QRFS_NORMAL, "")],
447
       (constants.QRFS_NORMAL, ""), (constants.QRFS_OFFLINE, None)],
441 448
      [(constants.QRFS_NORMAL, 2), (constants.QRFS_NODATA, None),
442
       (constants.QRFS_NORMAL, "x")],
449
       (constants.QRFS_NORMAL, "x"), (constants.QRFS_NORMAL, "abc")],
443 450
      [(constants.QRFS_NORMAL, 3), (constants.QRFS_NORMAL, False),
444
       (constants.QRFS_UNAVAIL, None)],
451
       (constants.QRFS_UNAVAIL, None), (constants.QRFS_OFFLINE, None)],
445 452
      ])
446 453

  
447 454
    self.assertEqual(cli.FormatQueryResult(response, header=False,
448 455
                                           separator="|"),
449 456
      (cli.QR_INCOMPLETE, [
450
      "1|N|",
451
      "2|(nodata)|x",
452
      "3|N|(unavail)",
457
      "1|N||(offline)",
458
      "2|(nodata)|x|abc",
459
      "3|N|(unavail)|(offline)",
453 460
      ]))
454 461

  
455 462
  def testInvalidFieldType(self):

Also available in: Unified diff