← Back to branch summary

~ubuntu-branches/ubuntu/quantal/virtinst/quantal-proposed

« back to all changes in this revision

Viewing changes to tests/virtconvtest.py

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2011-02-01 15:40:11 UTC
  • mfrom: (1.3.16 experimental)
  • Revision ID: james.westby@ubuntu.com-20110201154011-op0nusgc240xajvb
Tags: 0.500.5-1ubuntu1
* Merge from debian experimental. Remaining changes:
  - debian/patches/9001_Ubuntu.patch:
     + Updated to add maverick and natty to OS list and enable virtio
       for them.
  - debian/patches/9003-fix-path-to-hvmloader-in-testsuite.patch: adjust
    testsuite for 0001-fix-path-to-hvmloader.patch and
    0002-Fix-path-to-pygrub.patch. (refreshed)
  - debian/control: added acl package to depends.
  - Demote virt-viewer to Suggests, as it's in universe.
  - Recommends libvirt-bin
* Removed patches:
  - debian/patches/9002-libvirt_disk_format.patch: Upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/virtconvtest.py
16
16
 
17
17
import unittest
18
18
import virtconv
19
 
import os, os.path, glob
20
 
import tests
 
19
import os
 
20
import glob
 
21
import utils
21
22
 
22
23
BASE = "tests/virtconv-files"
23
24
 
48
49
 
49
50
        vmdef = inp.import_file(infile)
50
51
        out_expect = outp.export(vmdef)
51
 
        tests.diff_compare(out_expect, outfile)
 
52
        utils.diff_compare(out_expect, outfile)
52
53
 
53
54
    def _build_compare_path(self, base, in_path, out_dir, out_type):
54
55
        out_path = os.path.basename(in_path).rsplit(".", 1)[0]