Merge lp:~cerberus/nova/api_tests into lp:~hudson-openstack/nova/trunk

[Matt Dietz]

Moved API tests into a sub-folder of the tests/ and added a stubbed-out test declarations to mirror existing API tickets.

Resubmission from earlier because of my improper file move.

[Michael Gundlach (gundlach)]

80: get_backup_schedules should be part of server test (they're accessed through /servers/4/backup_schedules or something).

198: i'm assuming it was intentional that you didn't name this tests/api/rackspace/__init__.py even though it is testing tests/api/rackspace/__init__.py, whereas the other tests/api/* files do match up with their api/* counterparts. if not intentional, rename; otherwise, ignore this comment :)

review: Needs Fixing

[Michael Gundlach (gundlach)]

oh and in case you haven't done this thru the bzr workflow yet, you'll make your changes, do a bzr commit, and do a bzr push to modify this branch and thus the diff being merged.

to notify us via email that we should look at this again, set that status on the Merge Proposal page from "Needs Review" to "Work in Progress" and then to "Needs Review" again to generate the email. (yeah, I know.)

[Jay Pipes (jaypipes)]

Actually, you should mark the merge proposal "Work in Progress" when you are, um, working on it. :) Then, set it back to Needs Review when you, um, need a review again ;)

[Michael Gundlach (gundlach)]

Yeah, if you like doing extra busywork for no reason ;) How often does someone actually need to know if a "Needs Review" branch is actively having work done on it versus "it's in my queue to get reviewed again at some point"? The less process, the better :)

[Michael Gundlach (gundlach)]

Oh yeaaaah

review: Approve

[OpenStack Infra (hudson-openstack)]

The attempt to merge lp:~cerberus/nova/api_tests into lp:nova failed.Below is the output from the failed tests.

nova.tests.access_unittest
  AccessTestCase
    test_001_allow_all ... [OK]
    test_002_allow_none ... [OK]
    test_003_allow_project_manager ... [OK]
    test_004_allow_sys_and_net ... [OK]
    test_005_allow_sys_no_pm ... [OK]
nova.tests.api_unittest
  ApiEc2TestCase
    test_describe_instances ... [OK]
    test_get_all_key_pairs ... [OK]
nova.tests.auth_unittest
  AuthTestCase
    test_001_can_create_users ... [OK]
    test_002_can_get_user ... [OK]
    test_003_can_retreive_properties ... [OK]
    test_004_signature_is_valid ... [OK]
    test_005_can_get_credentials ... [OK]
    test_006_test_key_storage ... [OK]
    test_007_test_key_generation ... [OK]
    test_008_can_list_key_pairs ... [OK]
    test_009_can_delete_key_pair ... [OK]
    test_010_can_list_users ... [OK]
    test_101_can_add_user_role ... [OK]
    test_199_can_remove_user_role ... [OK]
    test_201_can_create_project ... [OK]
    test_202_user1_is_project_member ... [OK]
    test_203_user2_is_not_project_member ... [OK]
    test_204_user1_is_project_manager ... [OK]
    test_205_user2_is_not_project_manager ... [OK]
    test_206_can_add_user_to_project ... [OK]
    test_207_can_remove_user_from_project ... [OK]
    test_208_can_remove_add_user_with_role ... [OK]
    test_209_can_generate_x509 ... [OK]
    test_210_can_add_project_role ... [OK]
    test_211_can_list_project_roles ... [OK]
    test_212_can_remove_project_role ... [OK]
    test_214_can_retrieve_project_by_user ... [OK]
    test_299_can_delete_project ... [OK]
    test_999_can_delete_users ... [OK]
nova.tests.cloud_unittest
  CloudTestCase
    test_console_output ... [OK]
    test_instance_update_state ... [OK]
    test_run_instances ... ...

=== added directory 'nova/tests/api'
=== renamed file 'nova/api/test.py' => 'nova/tests/api/__init__.py'
--- nova/api/test.py	2010-08-18 22:00:20 +0000
+++ nova/tests/api/__init__.py	2010-09-01 16:42:43 +0000
@@ -26,7 +26,7 @@
 import webob.dec
 
 from nova import api
-
+from nova.tests.api.test_helper import *
 
 class Test(unittest.TestCase):
 
@@ -52,10 +52,8 @@
         result = webob.Request.blank('/test/cloud').get_response(api.API())
         self.assertNotEqual(result.body, "/cloud")
 
-
-class APIStub(object):
-    """Class to verify request and mark it was called."""
-
-    @webob.dec.wsgify
-    def __call__(self, req):
-        return req.path_info
+    def test_query_api_version(self):
+        pass
+
+if __name__ == '__main__':
+    unittest.main()

=== added directory 'nova/tests/api/rackspace'
=== added file 'nova/tests/api/rackspace/__init__.py'
=== added file 'nova/tests/api/rackspace/flavors.py'
--- nova/tests/api/rackspace/flavors.py	1970-01-01 00:00:00 +0000
+++ nova/tests/api/rackspace/flavors.py	2010-09-01 16:42:43 +0000
@@ -0,0 +1,34 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 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.
+
+import unittest
+
+from nova.api.rackspace import flavors
+from nova.tests.api.test_helper import *
+
+class FlavorsTest(unittest.TestCase):
+    def setUp(self):
+        self.stubs = stubout.StubOutForTesting()
+
+    def tearDown(self):
+        self.stubs.UnsetAll()
+
+    def test_get_flavor_list(self):
+        pass
+
+    def test_get_flavor_by_id(self):
+        pass

=== added file 'nova/tests/api/rackspace/images.py'
--- nova/tests/api/rackspace/images.py	1970-01-01 00:00:00 +0000
+++ nova/tests/api/rackspace/images.py	2010-09-01 16:42:43 +0000
@@ -0,0 +1,39 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 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.
+
+import unittest
+
+from nova.api.rackspace import images
+from nova.tests.api.test_helper import *
+
+class ImagesTest(unittest.TestCase):
+    def setUp(self):
+        self.stubs = stubout.StubOutForTesting()
+
+    def tearDown(self):
+        self.stubs.UnsetAll()
+
+    def test_get_image_list(self):
+        pass
+
+    def test_delete_image(self):
+        pass
+    
+    def test_create_image(self):
+        pass
+
+

=== added file 'nova/tests/api/rackspace/servers.py'
--- nova/tests/api/rackspace/servers.py	1970-01-01 00:00:00 +0000
+++ nova/tests/api/rackspace/servers.py	2010-09-01 16:42:43 +0000
@@ -0,0 +1,58 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 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.
+
+import unittest
+
+from nova.api.rackspace import servers
+from nova.tests.api.test_helper import *
+
+class ServersTest(unittest.TestCase):
+    def setUp(self):
+        self.stubs = stubout.StubOutForTesting()
+
+    def tearDown(self):
+        self.stubs.UnsetAll()
+
+    def test_get_server_list(self):
+        pass
+
+    def test_create_instance(self):
+        pass
+
+    def test_get_server_by_id(self):
+        pass
+
+    def test_get_backup_schedule(self):
+        pass
+
+    def test_get_server_details(self):
+        pass
+
+    def test_get_server_ips(self):
+        pass
+
+    def test_server_reboot(self):
+        pass
+
+    def test_server_rebuild(self):
+        pass
+
+    def test_server_resize(self):
+        pass
+
+    def test_delete_server_instance(self):
+        pass

=== added file 'nova/tests/api/rackspace/sharedipgroups.py'
--- nova/tests/api/rackspace/sharedipgroups.py	1970-01-01 00:00:00 +0000
+++ nova/tests/api/rackspace/sharedipgroups.py	2010-09-01 16:42:43 +0000
@@ -0,0 +1,40 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 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.
+
+import unittest
+
+from nova.api.rackspace import sharedipgroups
+from nova.tests.api.test_helper import *
+
+class SharedIpGroupsTest(unittest.TestCase):
+    def setUp(self):
+        self.stubs = stubout.StubOutForTesting()
+
+    def tearDown(self):
+        self.stubs.UnsetAll()
+
+    def test_get_shared_ip_groups(self):
+        pass
+
+    def test_create_shared_ip_group(self):
+        pass
+
+    def test_delete_shared_ip_group(self):
+        pass
+
+
+

=== added file 'nova/tests/api/test_helper.py'
--- nova/tests/api/test_helper.py	1970-01-01 00:00:00 +0000
+++ nova/tests/api/test_helper.py	2010-09-01 16:42:43 +0000
@@ -0,0 +1,7 @@
+import webob.dec
+
+class APIStub(object):
+    """Class to verify request and mark it was called."""
+    @webob.dec.wsgify
+    def __call__(self, req):
+        return req.path_info

=== renamed file 'nova/wsgi_test.py' => 'nova/tests/api/wsgi_test.py'