← Back to branch summary

~justin-fathomdb/nova/raw-disk-images

« back to all changes in this revision

Viewing changes to nova/tests/cloud_unittest.py

  • Committer: Soren Hansen
  • Date: 2010-07-16 16:09:15 UTC
  • mfrom: (139.2.2 remove-vendor)
  • Revision ID: soren.hansen@rackspace.com-20100716160915-pduf64nx3vjj1uxw
Merge lp:~anotherjesse/nova/remove-vendor

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/cloud_unittest.py
19
19
import logging
20
20
import StringIO
21
21
import time
 
22
from tornado import ioloop
 
23
from twisted.internet import defer
22
24
import unittest
23
25
from xml.etree import ElementTree
24
26
 
25
 
from nova import vendor
26
 
from tornado import ioloop
27
 
from twisted.internet import defer
28
 
 
29
27
from nova import flags
30
28
from nova import rpc
31
29
from nova import test