Merge lp:~vishvananda/nova/fix-subdir-tests into lp:~hudson-openstack/nova/trunk

[Vish Ishaya]

Allows subdirectory tests to run even if sqlite database doesn't exist.

[Josh Kearney (jk0)]

Seems reasonable enough to me.

review: Approve

[Devin Carlen (devcamcar)]

lgtm

review: Approve

=== modified file 'nova/tests/api/__init__.py'
--- nova/tests/api/__init__.py	2010-12-17 01:05:54 +0000
+++ nova/tests/api/__init__.py	2011-06-29 18:12:46 +0000
@@ -0,0 +1,19 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2011 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.
+
+# NOTE(vish): this forces the fixtures from tests/__init.py:setup() to work
+from nova.tests import *

=== modified file 'nova/tests/api/openstack/__init__.py'
--- nova/tests/api/openstack/__init__.py	2011-03-15 20:49:19 +0000
+++ nova/tests/api/openstack/__init__.py	2011-06-29 18:12:46 +0000
@@ -15,6 +15,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+# NOTE(vish): this forces the fixtures from tests/__init.py:setup() to work
+from nova.tests import *
+
 import webob.dec
 from nova import test
 

=== modified file 'nova/tests/image/__init__.py'
--- nova/tests/image/__init__.py	2011-03-21 20:40:26 +0000
+++ nova/tests/image/__init__.py	2011-06-29 18:12:46 +0000
@@ -14,3 +14,6 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+
+# NOTE(vish): this forces the fixtures from tests/__init.py:setup() to work
+from nova.tests import *

=== modified file 'nova/tests/integrated/__init__.py'
--- nova/tests/integrated/__init__.py	2011-03-10 20:10:49 +0000
+++ nova/tests/integrated/__init__.py	2011-06-29 18:12:46 +0000
@@ -18,3 +18,5 @@
 :mod:`integrated` -- Tests whole systems, using mock services where needed
 =================================
 """
+# NOTE(vish): this forces the fixtures from tests/__init.py:setup() to work
+from nova.tests import *

=== modified file 'nova/tests/scheduler/__init__.py'
--- nova/tests/scheduler/__init__.py	2011-05-17 23:49:21 +0000
+++ nova/tests/scheduler/__init__.py	2011-06-29 18:12:46 +0000
@@ -0,0 +1,19 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2011 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.
+
+# NOTE(vish): this forces the fixtures from tests/__init.py:setup() to work
+from nova.tests import *