summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJesse Andrews <jesse@gigantor.local>2010-07-15 11:07:40 -0500
committerJesse Andrews <jesse@gigantor.local>2010-07-15 11:07:40 -0500
commitc8fdce011092f23efd55385b45db8e6f3886beb1 (patch)
tree7f83ed5191fe1b4127232ee3bcd2ea39405e9315 /nova/tests
parent122fe2b75f635df0aa3858d05ed6775b76a9776e (diff)
remove import of vendor since we have PPA now
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/api_unittest.py2
-rw-r--r--nova/tests/cloud_unittest.py2
-rw-r--r--nova/tests/future_unittest.py2
-rw-r--r--nova/tests/model_unittest.py2
-rw-r--r--nova/tests/network_unittest.py2
-rw-r--r--nova/tests/node_unittest.py2
-rw-r--r--nova/tests/objectstore_unittest.py2
-rw-r--r--nova/tests/process_unittest.py2
-rw-r--r--nova/tests/users_unittest.py2
-rw-r--r--nova/tests/validator_unittest.py2
10 files changed, 10 insertions, 10 deletions
diff --git a/nova/tests/api_unittest.py b/nova/tests/api_unittest.py
index aee57b514..2937ef0b4 100644
--- a/nova/tests/api_unittest.py
+++ b/nova/tests/api_unittest.py
@@ -20,7 +20,7 @@ import httplib
import random
import StringIO
-from nova import vendor
+
import boto
from boto.ec2 import regioninfo
from tornado import httpserver
diff --git a/nova/tests/cloud_unittest.py b/nova/tests/cloud_unittest.py
index 9df83ec62..6bafe2ea7 100644
--- a/nova/tests/cloud_unittest.py
+++ b/nova/tests/cloud_unittest.py
@@ -22,7 +22,7 @@ import time
import unittest
from xml.etree import ElementTree
-from nova import vendor
+
from tornado import ioloop
from twisted.internet import defer
diff --git a/nova/tests/future_unittest.py b/nova/tests/future_unittest.py
index be4218c39..a4523a315 100644
--- a/nova/tests/future_unittest.py
+++ b/nova/tests/future_unittest.py
@@ -22,7 +22,7 @@ import time
import unittest
from xml.etree import ElementTree
-from nova import vendor
+
import mox
from tornado import ioloop
from twisted.internet import defer
diff --git a/nova/tests/model_unittest.py b/nova/tests/model_unittest.py
index f70cab40d..37a4c3e80 100644
--- a/nova/tests/model_unittest.py
+++ b/nova/tests/model_unittest.py
@@ -19,7 +19,7 @@
import logging
import time
-from nova import vendor
+
from twisted.internet import defer
from nova import exception
diff --git a/nova/tests/network_unittest.py b/nova/tests/network_unittest.py
index dd1966ffa..af9efffbd 100644
--- a/nova/tests/network_unittest.py
+++ b/nova/tests/network_unittest.py
@@ -20,7 +20,7 @@ import os
import logging
import unittest
-from nova import vendor
+
import IPy
from nova import flags
diff --git a/nova/tests/node_unittest.py b/nova/tests/node_unittest.py
index 4f7bbd587..60f97741e 100644
--- a/nova/tests/node_unittest.py
+++ b/nova/tests/node_unittest.py
@@ -21,7 +21,7 @@ import time
from xml.etree import ElementTree
-from nova import vendor
+
from twisted.internet import defer
from nova import exception
diff --git a/nova/tests/objectstore_unittest.py b/nova/tests/objectstore_unittest.py
index ca2d31159..0c700ff96 100644
--- a/nova/tests/objectstore_unittest.py
+++ b/nova/tests/objectstore_unittest.py
@@ -23,7 +23,7 @@ import os
import shutil
import tempfile
-from nova import vendor
+
from nova import flags
from nova import objectstore
diff --git a/nova/tests/process_unittest.py b/nova/tests/process_unittest.py
index 671ab05cd..fe625b6c8 100644
--- a/nova/tests/process_unittest.py
+++ b/nova/tests/process_unittest.py
@@ -19,7 +19,7 @@
import logging
from xml.etree import ElementTree
-from nova import vendor
+
from twisted.internet import defer
from twisted.internet import reactor
diff --git a/nova/tests/users_unittest.py b/nova/tests/users_unittest.py
index 6110248b5..4bc66ca5c 100644
--- a/nova/tests/users_unittest.py
+++ b/nova/tests/users_unittest.py
@@ -19,7 +19,7 @@
import logging
import unittest
-from nova import vendor
+
from M2Crypto import BIO
from M2Crypto import RSA
from M2Crypto import X509
diff --git a/nova/tests/validator_unittest.py b/nova/tests/validator_unittest.py
index 38cddfef1..fba5b3060 100644
--- a/nova/tests/validator_unittest.py
+++ b/nova/tests/validator_unittest.py
@@ -19,7 +19,7 @@
import logging
import unittest
-from nova import vendor
+
from nova import flags
from nova import test