summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-03-08 19:43:35 +0000
committerGerrit Code Review <review@openstack.org>2012-03-08 19:43:35 +0000
commita5fba51ce08e6f93134b434fccd5a960f7e215ec (patch)
tree4f241099cb71954daba942f05b992b06de59610e
parenta3b799e3e6e39ca25627d2b9a2dfa9871ba00a29 (diff)
parentc2bf2843646ce8fd98312c7ea8b710d391332ece (diff)
downloadnova-a5fba51ce08e6f93134b434fccd5a960f7e215ec.tar.gz
nova-a5fba51ce08e6f93134b434fccd5a960f7e215ec.tar.xz
nova-a5fba51ce08e6f93134b434fccd5a960f7e215ec.zip
Merge "Moving nova/network tests to more logical home."
-rw-r--r--nova/tests/network/__init__.py17
-rw-r--r--nova/tests/network/test_manager.py (renamed from nova/tests/test_network.py)0
2 files changed, 17 insertions, 0 deletions
diff --git a/nova/tests/network/__init__.py b/nova/tests/network/__init__.py
new file mode 100644
index 000000000..9db637496
--- /dev/null
+++ b/nova/tests/network/__init__.py
@@ -0,0 +1,17 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2012 Openstack LLC.
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+from nova.tests import *
diff --git a/nova/tests/test_network.py b/nova/tests/network/test_manager.py
index 2e50587f9..2e50587f9 100644
--- a/nova/tests/test_network.py
+++ b/nova/tests/network/test_manager.py