From c8fdce011092f23efd55385b45db8e6f3886beb1 Mon Sep 17 00:00:00 2001 From: Jesse Andrews Date: Thu, 15 Jul 2010 11:07:40 -0500 Subject: remove import of vendor since we have PPA now --- nova/tests/api_unittest.py | 2 +- nova/tests/cloud_unittest.py | 2 +- nova/tests/future_unittest.py | 2 +- nova/tests/model_unittest.py | 2 +- nova/tests/network_unittest.py | 2 +- nova/tests/node_unittest.py | 2 +- nova/tests/objectstore_unittest.py | 2 +- nova/tests/process_unittest.py | 2 +- nova/tests/users_unittest.py | 2 +- nova/tests/validator_unittest.py | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) (limited to 'nova/tests') 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 -- cgit From 3ce6ec1a83731da868c5a77c4684808a54ffd8fd Mon Sep 17 00:00:00 2001 From: Jesse Andrews Date: Thu, 15 Jul 2010 18:13:48 -0500 Subject: reorder imports spacing --- nova/tests/access_unittest.py | 5 +++-- nova/tests/api_integration.py | 3 ++- nova/tests/api_unittest.py | 6 ++---- nova/tests/cloud_unittest.py | 6 ++---- nova/tests/future_unittest.py | 8 +++----- nova/tests/model_unittest.py | 2 -- nova/tests/network_unittest.py | 4 +--- nova/tests/node_unittest.py | 6 ++---- nova/tests/objectstore_unittest.py | 4 +--- nova/tests/process_unittest.py | 4 +--- nova/tests/users_unittest.py | 4 +--- nova/tests/validator_unittest.py | 2 -- 12 files changed, 18 insertions(+), 36 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/access_unittest.py b/nova/tests/access_unittest.py index 609bda901..8500dd0cb 100644 --- a/nova/tests/access_unittest.py +++ b/nova/tests/access_unittest.py @@ -19,11 +19,12 @@ import unittest import logging -from nova.auth.users import UserManager -from nova.auth import rbac from nova import exception from nova import flags from nova import test +from nova.auth.users import UserManager +from nova.auth import rbac + FLAGS = flags.FLAGS class Context(object): diff --git a/nova/tests/api_integration.py b/nova/tests/api_integration.py index 0ccf69525..23a88f083 100644 --- a/nova/tests/api_integration.py +++ b/nova/tests/api_integration.py @@ -16,10 +16,11 @@ # License for the specific language governing permissions and limitations # under the License. -import unittest import boto from boto.ec2.regioninfo import RegionInfo +import unittest + ACCESS_KEY = 'fake' SECRET_KEY = 'fake' diff --git a/nova/tests/api_unittest.py b/nova/tests/api_unittest.py index 2937ef0b4..e5e2afe26 100644 --- a/nova/tests/api_unittest.py +++ b/nova/tests/api_unittest.py @@ -16,13 +16,11 @@ # License for the specific language governing permissions and limitations # under the License. +import boto +from boto.ec2 import regioninfo import httplib import random import StringIO - - -import boto -from boto.ec2 import regioninfo from tornado import httpserver from twisted.internet import defer diff --git a/nova/tests/cloud_unittest.py b/nova/tests/cloud_unittest.py index 6bafe2ea7..b8614fdc8 100644 --- a/nova/tests/cloud_unittest.py +++ b/nova/tests/cloud_unittest.py @@ -19,12 +19,10 @@ import logging import StringIO import time -import unittest -from xml.etree import ElementTree - - from tornado import ioloop from twisted.internet import defer +import unittest +from xml.etree import ElementTree from nova import flags from nova import rpc diff --git a/nova/tests/future_unittest.py b/nova/tests/future_unittest.py index a4523a315..da5470ffe 100644 --- a/nova/tests/future_unittest.py +++ b/nova/tests/future_unittest.py @@ -17,15 +17,13 @@ # under the License. import logging +import mox import StringIO import time -import unittest -from xml.etree import ElementTree - - -import mox from tornado import ioloop from twisted.internet import defer +import unittest +from xml.etree import ElementTree from nova import cloud from nova import exception diff --git a/nova/tests/model_unittest.py b/nova/tests/model_unittest.py index 37a4c3e80..1bd7e527f 100644 --- a/nova/tests/model_unittest.py +++ b/nova/tests/model_unittest.py @@ -18,8 +18,6 @@ import logging import time - - from twisted.internet import defer from nova import exception diff --git a/nova/tests/network_unittest.py b/nova/tests/network_unittest.py index af9efffbd..a822cc1d9 100644 --- a/nova/tests/network_unittest.py +++ b/nova/tests/network_unittest.py @@ -16,13 +16,11 @@ # License for the specific language governing permissions and limitations # under the License. +import IPy import os import logging import unittest - -import IPy - from nova import flags from nova import test from nova import exception diff --git a/nova/tests/node_unittest.py b/nova/tests/node_unittest.py index 60f97741e..93942d79e 100644 --- a/nova/tests/node_unittest.py +++ b/nova/tests/node_unittest.py @@ -18,11 +18,8 @@ import logging import time - -from xml.etree import ElementTree - - from twisted.internet import defer +from xml.etree import ElementTree from nova import exception from nova import flags @@ -31,6 +28,7 @@ from nova import utils from nova.compute import model from nova.compute import node + FLAGS = flags.FLAGS diff --git a/nova/tests/objectstore_unittest.py b/nova/tests/objectstore_unittest.py index 0c700ff96..f47ca7f00 100644 --- a/nova/tests/objectstore_unittest.py +++ b/nova/tests/objectstore_unittest.py @@ -23,15 +23,13 @@ import os import shutil import tempfile - - from nova import flags from nova import objectstore from nova import test from nova.auth import users -FLAGS = flags.FLAGS +FLAGS = flags.FLAGS oss_tempdir = tempfile.mkdtemp(prefix='test_oss-') diff --git a/nova/tests/process_unittest.py b/nova/tests/process_unittest.py index fe625b6c8..01648961f 100644 --- a/nova/tests/process_unittest.py +++ b/nova/tests/process_unittest.py @@ -17,11 +17,9 @@ # under the License. import logging -from xml.etree import ElementTree - - from twisted.internet import defer from twisted.internet import reactor +from xml.etree import ElementTree from nova import exception from nova import flags diff --git a/nova/tests/users_unittest.py b/nova/tests/users_unittest.py index 4bc66ca5c..301721075 100644 --- a/nova/tests/users_unittest.py +++ b/nova/tests/users_unittest.py @@ -17,12 +17,10 @@ # under the License. import logging -import unittest - - from M2Crypto import BIO from M2Crypto import RSA from M2Crypto import X509 +import unittest from nova import crypto from nova import flags diff --git a/nova/tests/validator_unittest.py b/nova/tests/validator_unittest.py index fba5b3060..84daa135e 100644 --- a/nova/tests/validator_unittest.py +++ b/nova/tests/validator_unittest.py @@ -19,8 +19,6 @@ import logging import unittest - - from nova import flags from nova import test from nova import validate -- cgit From 76ad7b8d40352ba39f5da9bb19ad1ab52ab3986e Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Thu, 15 Jul 2010 23:16:09 +0000 Subject: no more print in storage unittest --- nova/tests/storage_unittest.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/storage_unittest.py b/nova/tests/storage_unittest.py index b04602b71..60576d74f 100644 --- a/nova/tests/storage_unittest.py +++ b/nova/tests/storage_unittest.py @@ -69,13 +69,11 @@ class StorageTestCase(test.TrialTestCase): vols = [] for i in xrange(total_slots): vid = self.mystorage.create_volume(vol_size, user_id, project_id) - print vid vols.append(vid) self.assertRaises(storage.NoMoreVolumes, self.mystorage.create_volume, vol_size, user_id, project_id) for id in vols: - print id self.mystorage.delete_volume(id) def test_run_attach_detach_volume(self): -- cgit