~ubuntu-branches/ubuntu/oneiric/nova/oneiric

« back to all changes in this revision

Viewing changes to nova/tests/test_cloud.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2011-09-16 10:29:09 UTC
  • mfrom: (1.1.30 upstream)
  • Revision ID: package-import@ubuntu.com-20110916102909-m7nnuohdd9hjmypx
Tags: 2011.3~rc~20110916.r1173-0ubuntu1
* New uptream version. 
* debian/rules: Dont fail tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1540
1540
                    'ephemeral0': '/dev/sdb',
1541
1541
                    'swap': '/dev/sdc',
1542
1542
                    'ephemeral1': '/dev/sdd',
1543
 
                    'ephemeral2': '/dev/sd3'}
 
1543
                    'ephemeral2': '/dev/sd3',
 
1544
                    'ebs0': '/dev/sdh',
 
1545
                    'ebs1': '/dev/sdi'}
1544
1546
 
1545
1547
        self.assertEqual(self.cloud._format_instance_mapping(ctxt,
1546
1548
                                                             instance_ref0),