← Back to branch summary

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

« back to all changes in this revision

Viewing changes to tests/xmlparse.py

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-07-24 08:52:01 UTC
  • mfrom: (1.6.8 sid)
  • Revision ID: package-import@ubuntu.com-20120724085201-q3h0cbabg4t46gfm
Tags: 0.600.2-1ubuntu1
* Merge from debian unstable. Remaining changes:
  - 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.
  - debian/patches/9004_ubuntu_fix_tree_support.patch: Fix tree detection
    for all ISO/HTTP source, to not longer fail with cobbler/koan.
  - debian/patches/0004-Fix-path-to-qemu-dm.patch: fix the path to the
    qemu-dm binary.
  - debian/{control,rules,pyversions}: Build using dh_python2, use
    debhelper v8 instead of cdbs; for some reason the package build an
    empty binary package when using dh_python2.
  - debian/control: added acl package to depends.
  - debian/control: added libvirt-bin to recommends
* Dropped patches:
  - debian/patches/9005_ubuntu_releases.patch: Upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/xmlparse.py
92
92
        check = self._make_checker(guest)
93
93
 
94
94
        check("name", "TestGuest", "change_name")
95
 
        check("description", None, "Hey desc changed")
 
95
        check("description", None, "Hey desc changed&")
96
96
        check("maxvcpus", 5, 12)
97
97
        check("vcpus", 12, 10)
98
98
        check("cpuset", "1-3", "1-8,^6", "1-5,15")
160
160
        check("memory_mode", "interleave", "strict", None)
161
161
        check("memory_nodeset", "1-5,^3,7", "2,4,6")
162
162
 
 
163
        check = self._make_checker(guest.get_devices("memballoon")[0])
 
164
        check("model", "virtio", "none")
 
165
 
163
166
        self._alter_compare(guest.get_config_xml(), outfile)
164
167
 
165
168
    def testAlterMinimalGuest(self):
387
390
        check("model", None, "testmodel")
388
391
        check("bridge", None, "br0")
389
392
        check("network", None, "route")
390
 
        check("macaddr", "11:11:11:11:11:11", "AA:AA:AA:AA:AA:AA")
 
393
        check("macaddr", "22:11:11:11:11:11", "AA:AA:AA:AA:AA:AA")
391
394
        self.assertEquals(dev1.get_source(), None)
392
395
 
393
396
        check = self._make_checker(dev2)
547
550
        check("type", "pci")
548
551
        check("managed", True, True)
549
552
        check("mode", "subsystem", "capabilities")
550
 
        check("domain", "0x0", "0x2")
551
 
        check("bus", "0x11", "0x99")
552
 
        check("slot", "0x22", "0x88")
553
 
        check("function", "0x33", "0x77")
 
553
        check("domain", "0x0", "0x4")
 
554
        check("bus", "0x1", "0x5")
 
555
        check("slot", "0x2", "0x6")
 
556
        check("function", "0x3", "0x7")
554
557
 
555
558
        self._alter_compare(guest.get_config_xml(), outfile)
556
559