← Back to branch summary

~smoser/curtin/yakkety.lp1666986

« back to all changes in this revision

Viewing changes to tests/vmtests/image_sync.py

  • Committer: Scott Moser
  • Date: 2016-07-12 16:28:59 UTC
  • mto: (58.1.1 pkg)
  • mto: This revision was merged to the branch mainline in revision 54.
  • Revision ID: smoser@ubuntu.com-20160712162859-f9jmixbnjsn3keu9
Tags: upstream-0.1.0~bzr399
Import upstream version 0.1.0~bzr399

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/vmtests/image_sync.py
29
29
VMTEST_CONTENT_ID = 'com.ubuntu.maas:daily:v2:download'
30
30
VMTEST_JSON_PATH = "streams/v1/vmtest.json"
31
31
 
 
32
DEFAULT_OUTPUT_FORMAT = (
 
33
    "%(release)-7s %(arch)s/%(subarch)s %(version_name)-10s %(item_name)s")
32
34
 
33
35
DEFAULT_ARCHES = {
34
36
    'i386': ['i386'],
397
399
    results = query(args.mirror_url, args.max_items, args.filters,
398
400
                    verbosity=vlevel)
399
401
    try:
400
 
        print(util.json_dumps(results).decode())
 
402
        if args.output_format == FORMAT_JSON:
 
403
            print(util.json_dumps(results).decode())
 
404
        else:
 
405
            output = []
 
406
            for item in results:
 
407
                try:
 
408
                    output.append(args.output_format % item)
 
409
                except KeyError as e:
 
410
                    sys.stderr.write("output format failed (%s) for: %s\n" %
 
411
                                     (e, item))
 
412
                    sys.exit(1)
 
413
            for line in sorted(output):
 
414
                print(line)
401
415
    except IOError as e:
402
416
        if e.errno == errno.EPIPE:
403
417
            sys.exit(0x80 | signal.SIGPIPE)
440
454
 
441
455
    fmt_group = query_p.add_mutually_exclusive_group()
442
456
    fmt_group.add_argument('--output-format', '-o', action='store',
443
 
                           dest='output_format', default=None,
 
457
                           dest='output_format', default=DEFAULT_OUTPUT_FORMAT,
444
458
                           help="specify output format per python str.format")
445
459
    fmt_group.add_argument('--json', action='store_const',
446
460
                           const=FORMAT_JSON, dest='output_format',