xenapi: test_rescue incorrectly verifies original swap wasn't attached

[Johannes Erdfelt]

The code currently does:

        vdi_uuids = []
         for vbd_uuid in rescue_vm["VBDs"]:
            vdi_uuids.append(xenapi_fake.get_record('VBD', vbd_uuid)["VDI"])
        self.assertNotIn("swap", vdi_uuids)

vdi_uuids is a list of uuid references. "swap" will never match a uuid, so that test will always be true, even if the code is broken.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/79687

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/79687
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=2e7bd74b8d23153a2af81e994101071f9b857909
Submitter: Jenkins
Branch: master

commit 2e7bd74b8d23153a2af81e994101071f9b857909
Author: Johannes Erdfelt <email address hidden>
Date: Tue Mar 11 10:08:51 2014 -0700

    xenapi: Fix test_rescue test to ensure assertions are valid

    The assertion in this test gathers the list of VDI references and then
    checks if the string 'swap' isn't in the list. A VDI reference is a
    UUID, so the string 'swap' will never match, even if the code being
    tested is buggy.

    Compare against an actual VDI reference. Also, add a positive assertion
    to check that the root disk from the original VM is attached.

    Change-Id: I3e3e9798ce63f2f260b7993620fde3749452bfc9
    Closes-bug: 1290903