Merge lp:~devcamcar/django-nova/improve_unittests into lp:django-nova

[Devin Carlen]

Improved unit tests for views

[Devin Carlen (devcamcar)]

approve

review: Approve

[Jesse Andrews (anotherjesse)]

u can do merge?

=== modified file 'src/django_nova/tests/urls.py'
--- src/django_nova/tests/urls.py	2011-01-18 02:09:01 +0000
+++ src/django_nova/tests/urls.py	2011-02-13 02:22:10 +0000
@@ -29,4 +29,8 @@
     url(r'^region/', include('django_nova.urls.region')),
     url(r'^admin/projects/', include('django_nova.urls.admin_project')),
     url(r'^admin/roles/', include('django_nova.urls.admin_roles')),
-)
 \ No newline at end of file
+    url(r'^credentials/download/(?P<auth_token>\w+)/$',
+        'django_nova.views.credentials.authorize_credentials',
+        name='nova_credentials_authorize'),
+)
+
 
=== modified file 'src/django_nova/tests/view_tests/__init__.py'
--- src/django_nova/tests/view_tests/__init__.py	2011-01-21 22:38:42 +0000
+++ src/django_nova/tests/view_tests/__init__.py	2011-02-13 02:22:10 +0000
@@ -1,3 +1,7 @@
+from credential_tests import *
+from image_tests import *
+from instance_tests import *
 from keypair_tests import *
-from image_tests import *
-from instance_tests import *
 \ No newline at end of file
+from region_tests import *
+from volume_tests import *
+
 
=== modified file 'src/django_nova/tests/view_tests/base.py'
--- src/django_nova/tests/view_tests/base.py	2011-01-22 22:27:53 +0000
+++ src/django_nova/tests/view_tests/base.py	2011-02-13 02:22:10 +0000
@@ -1,3 +1,25 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# 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.
+
+"""
+Base classes for view based unit tests.
+"""
+
 import mox
 
 from django import test
@@ -13,19 +35,36 @@
 TEST_REGION = 'test'
 
 
-class BaseProjectViewTests(test.TestCase):
+class BaseViewTests(test.TestCase):
     def setUp(self):
-        project = adminclient.ProjectInfo()
-        project.projectname = TEST_PROJECT
-        project.projectManagerId = TEST_USER
-
         self.mox = mox.Mox()
-        self.user = auth_models.User.objects.create_user(TEST_USER,
+
+    def tearDown(self):
+        self.mox.UnsetStubs()
+
+    def assertRedirectsNoFollow(self, response, expected_url):
+        self.assertEqual(response._headers['location'],
+                         ('Location', settings.TESTSERVER + expected_url))
+        self.assertEqual(response.status_code, 302)
+
+    def authenticateTestUser(self):
+        user = auth_models.User.objects.create_user(TEST_USER,
                                                          '[e-mail]',
                                                          password='test')
         login = self.client.login(username=TEST_USER, password='test')
         self.failUnless(login, 'Unable to login')
-
+        return user
+
+
+class BaseProjectViewTests(BaseViewTests):
+    def setUp(self):
+        super(BaseProjectViewTests, self).setUp()
+
+        project = adminclient.ProjectInfo()
+        project.projectname = TEST_PROJECT
+        project.projectManagerId = TEST_USER
+
+        self.user = self.authenticateTestUser()
         self.region = adminclient.RegionInfo(name=TEST_REGION,
                                              endpoint='http://test:8773/')
         self.project = manager.ProjectManager(self.user.username,
@@ -35,17 +74,17 @@
         shortcuts.get_project_or_404(mox.IgnoreArg(),
                                      'test').AndReturn(self.project)
 
-    def tearDown(self):
-        self.mox.UnsetStubs()
-
-    def assertRedirectsNoFollow(self, response, expected_url):
-        self.assertEqual(response._headers['location'],
-                         ('Location', settings.TESTSERVER + expected_url))
-        self.assertEqual(response.status_code, 302)
-
     def create_key_pair_choices(self, key_names):
         return [(k, k) for k in key_names]
 
     def create_instance_type_choices(self):
         return [('m1.medium', 'm1.medium'),
                 ('m1.large', 'm1.large')]
+
+    def create_instance_choices(self, instance_ids):
+        return [(id, id) for id in instance_ids]
+
+    def create_available_volume_choices(self, volumes):
+        return [(v.id, '%s %s - %dGB' % (v.id, v.displayName, v.size)) \
+                for v in volumes]
+
 
=== added file 'src/django_nova/tests/view_tests/credential_tests.py'
--- src/django_nova/tests/view_tests/credential_tests.py	1970-01-01 00:00:00 +0000
+++ src/django_nova/tests/view_tests/credential_tests.py	2011-02-13 02:22:10 +0000
@@ -0,0 +1,70 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# 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.
+
+"""
+Unit tests for credential views.
+"""
+
+import mox
+from django.conf import settings
+from django.core.urlresolvers import reverse
+from django_nova import models
+from django_nova.tests.view_tests.base import BaseViewTests
+
+
+class CredentialViewTests(BaseViewTests):
+    def test_download_expired_credentials(self):
+        auth_token = 'expired'
+        self.mox.StubOutWithMock(models.CredentialsAuthorization,
+                                 'get_by_token')
+        models.CredentialsAuthorization.get_by_token(auth_token) \
+                                       .AndReturn(None)
+        self.mox.ReplayAll()
+
+        res = self.client.get(reverse('nova_credentials_authorize',
+                                      args=[auth_token]))
+        self.assertTemplateUsed(res, 'django_nova/credentials/expired.html')
+
+        self.mox.VerifyAll()
+
+    def test_download_good_credentials(self):
+        auth_token = 'good'
+
+        creds = models.CredentialsAuthorization()
+        creds.username = 'test'
+        creds.project = 'test'
+        creds.auth_token = auth_token
+
+        self.mox.StubOutWithMock(models.CredentialsAuthorization,
+                                 'get_by_token')
+        self.mox.StubOutWithMock(creds, 'get_zip')
+        models.CredentialsAuthorization.get_by_token(auth_token) \
+                                       .AndReturn(creds)
+        creds.get_zip().AndReturn('zip')
+
+        self.mox.ReplayAll()
+
+        res = self.client.get(reverse('nova_credentials_authorize',
+                                      args=[auth_token]))
+        self.assertEqual(res.status_code, 200)
+        self.assertEqual(res['Content-Disposition'],
+                         'attachment; filename=%s-test-test-x509.zip' %
+                         settings.SITE_NAME)
+        self.assertContains(res, 'zip')
+
+        self.mox.VerifyAll()
 
=== modified file 'src/django_nova/tests/view_tests/image_tests.py'
--- src/django_nova/tests/view_tests/image_tests.py	2011-01-25 23:51:20 +0000
+++ src/django_nova/tests/view_tests/image_tests.py	2011-02-13 02:22:10 +0000
@@ -1,3 +1,25 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# 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.
+
+"""
+Unit tests for image views.
+"""
+
 import boto.ec2.image
 import boto.ec2.instance
 import mox
 
=== modified file 'src/django_nova/tests/view_tests/instance_tests.py'
--- src/django_nova/tests/view_tests/instance_tests.py	2011-01-22 01:04:51 +0000
+++ src/django_nova/tests/view_tests/instance_tests.py	2011-02-13 02:22:10 +0000
@@ -1,3 +1,25 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# 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.
+
+"""
+Unit tests for instance views.
+"""
+
 import boto.ec2.instance
 import mox
 
 
=== modified file 'src/django_nova/tests/view_tests/keypair_tests.py'
--- src/django_nova/tests/view_tests/keypair_tests.py	2011-01-22 01:04:51 +0000
+++ src/django_nova/tests/view_tests/keypair_tests.py	2011-02-13 02:22:10 +0000
@@ -1,8 +1,31 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# 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.
+
+"""
+Unit tests for key pair views.
+"""
+
 import boto.ec2.keypair
 import mox
 
 from django.core.urlresolvers import reverse
-from django_nova.tests.view_tests.base import BaseProjectViewTests, TEST_PROJECT
+from django_nova.tests.view_tests.base import (BaseProjectViewTests,
+                                              TEST_PROJECT)
 
 
 TEST_KEY = 'test_key'
@@ -36,8 +59,7 @@
 
         url = reverse('nova_keypairs_add', args=[TEST_PROJECT])
         data = {'js': '0', 'name': key.name}
-        res = self.client.post(url,
-                               data)
+        res = self.client.post(url, data)
         self.assertEqual(res.status_code, 200)
         self.assertEqual(res['Content-Type'], 'application/binary')
 
 
=== added file 'src/django_nova/tests/view_tests/region_tests.py'
--- src/django_nova/tests/view_tests/region_tests.py	1970-01-01 00:00:00 +0000
+++ src/django_nova/tests/view_tests/region_tests.py	2011-02-13 02:22:10 +0000
@@ -0,0 +1,43 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# 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.
+
+"""
+Unit tests for region views.
+"""
+
+from django.core.urlresolvers import reverse
+from django_nova.tests.view_tests.base import BaseViewTests
+from django_nova import shortcuts
+
+
+TEST_REGION = 'one'
+
+
+class RegionViewTests(BaseViewTests):
+    def test_change(self):
+        self.authenticateTestUser()
+        session = self.client.session
+        session['region'] = 'two'
+        session.save()
+
+        data = {'redirect_url': '/',
+                'region': TEST_REGION}
+        res = self.client.post(reverse('region_change'), data)
+        self.assertEqual(self.client.session['region'], TEST_REGION)
+        self.assertRedirectsNoFollow(res, '/')
+
 
=== added file 'src/django_nova/tests/view_tests/volume_tests.py'
--- src/django_nova/tests/view_tests/volume_tests.py	1970-01-01 00:00:00 +0000
+++ src/django_nova/tests/view_tests/volume_tests.py	2011-02-13 02:22:10 +0000
@@ -0,0 +1,170 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# 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.
+
+"""
+Unit tests for volume views.
+"""
+
+import boto.ec2.volume
+import mox
+
+from django.core.urlresolvers import reverse
+from django_nova import forms
+from django_nova.tests.view_tests.base import (BaseProjectViewTests,
+                                               TEST_PROJECT)
+
+
+TEST_VOLUME = 'vol-0000001'
+
+
+class VolumeTests(BaseProjectViewTests):
+    def test_index(self):
+        instance_id = 'i-abcdefgh'
+
+        volume = boto.ec2.volume.Volume()
+        volume.id = TEST_VOLUME
+        volume.displayName = TEST_VOLUME
+        volume.size = 1
+
+        self.mox.StubOutWithMock(self.project, 'get_volumes')
+        self.mox.StubOutWithMock(forms, 'get_available_volume_choices')
+        self.mox.StubOutWithMock(forms, 'get_instance_choices')
+        self.project.get_volumes().AndReturn([])
+        forms.get_available_volume_choices(mox.IgnoreArg()).AndReturn(
+                self.create_available_volume_choices([volume]))
+        forms.get_instance_choices(mox.IgnoreArg()).AndReturn(
+                self.create_instance_choices([instance_id]))
+
+        self.mox.ReplayAll()
+
+        response = self.client.get(reverse('nova_volumes',
+                                           args=[TEST_PROJECT]))
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'django_nova/volumes/index.html')
+        self.assertEqual(len(response.context['volumes']), 0)
+
+        self.mox.VerifyAll()
+
+    def test_add_get(self):
+        self.mox.ReplayAll()
+
+        res = self.client.get(reverse('nova_volumes_add', args=[TEST_PROJECT]))
+        self.assertRedirectsNoFollow(res, reverse('nova_volumes',
+                                                  args=[TEST_PROJECT]))
+        self.mox.VerifyAll()
+
+    def test_add_post(self):
+        vol = boto.ec2.volume.Volume()
+        vol.name = TEST_VOLUME
+        vol.displayName = TEST_VOLUME
+        vol.size = 1
+
+        self.mox.StubOutWithMock(self.project, 'create_volume')
+        self.project.create_volume(vol.size, vol.name, vol.name).AndReturn(vol)
+
+        self.mox.ReplayAll()
+
+        url = reverse('nova_volumes_add', args=[TEST_PROJECT])
+        data = {'size': '1',
+                'nickname': TEST_VOLUME,
+                'description': TEST_VOLUME}
+        res = self.client.post(url, data)
+        self.assertRedirectsNoFollow(res, reverse('nova_volumes',
+                                                  args=[TEST_PROJECT]))
+        self.mox.VerifyAll()
+
+    def test_delete_get(self):
+        self.mox.ReplayAll()
+
+        res = self.client.get(reverse('nova_volumes_delete',
+                                      args=[TEST_PROJECT, TEST_VOLUME]))
+        self.assertRedirectsNoFollow(res, reverse('nova_volumes',
+                                                  args=[TEST_PROJECT]))
+        self.mox.VerifyAll()
+
+    def test_delete_post(self):
+        self.mox.StubOutWithMock(self.project, 'delete_volume')
+        self.project.delete_volume(TEST_VOLUME).AndReturn(True)
+
+        self.mox.ReplayAll()
+
+        res = self.client.post(reverse('nova_volumes_delete',
+                                       args=[TEST_PROJECT, TEST_VOLUME]))
+        self.assertRedirectsNoFollow(res, reverse('nova_volumes',
+                                                  args=[TEST_PROJECT]))
+        self.mox.VerifyAll()
+
+    def test_attach_get(self):
+        self.mox.ReplayAll()
+
+        res = self.client.get(reverse('nova_volumes_attach',
+                                      args=[TEST_PROJECT]))
+        self.assertRedirectsNoFollow(res, reverse('nova_volumes',
+                                                  args=[TEST_PROJECT]))
+        self.mox.VerifyAll()
+
+    def test_attach_post(self):
+        volume = boto.ec2.volume.Volume()
+        volume.id = TEST_VOLUME
+        volume.displayName = TEST_VOLUME
+        volume.size = 1
+
+        instance_id = 'i-abcdefgh'
+        device = '/dev/vdb'
+
+        self.mox.StubOutWithMock(self.project, 'attach_volume')
+        self.mox.StubOutWithMock(forms, 'get_available_volume_choices')
+        self.mox.StubOutWithMock(forms, 'get_instance_choices')
+        self.project.attach_volume(TEST_VOLUME, instance_id, device) \
+                    .AndReturn(True)
+        forms.get_available_volume_choices(mox.IgnoreArg()).AndReturn(
+                self.create_available_volume_choices([volume]))
+        forms.get_instance_choices(mox.IgnoreArg()).AndReturn(
+                self.create_instance_choices([instance_id]))
+
+        self.mox.ReplayAll()
+
+        url = reverse('nova_volumes_attach', args=[TEST_PROJECT])
+        data = {'volume': TEST_VOLUME,
+                'instance': instance_id,
+                'device': device}
+        res = self.client.post(url, data)
+        self.assertRedirectsNoFollow(res, reverse('nova_volumes',
+                                                  args=[TEST_PROJECT]))
+        self.mox.VerifyAll()
+
+    def test_detach_get(self):
+        self.mox.ReplayAll()
+
+        res = self.client.get(reverse('nova_volumes_detach',
+                                      args=[TEST_PROJECT, TEST_VOLUME]))
+        self.assertRedirectsNoFollow(res, reverse('nova_volumes',
+                                                  args=[TEST_PROJECT]))
+        self.mox.VerifyAll()
+
+    def test_detach_post(self):
+        self.mox.StubOutWithMock(self.project, 'detach_volume')
+        self.project.detach_volume(TEST_VOLUME).AndReturn(True)
+
+        self.mox.ReplayAll()
+
+        res = self.client.post(reverse('nova_volumes_detach',
+                                       args=[TEST_PROJECT, TEST_VOLUME]))
+        self.assertRedirectsNoFollow(res, reverse('nova_volumes',
+                                                  args=[TEST_PROJECT]))
+        self.mox.VerifyAll()
 
=== modified file 'src/django_nova/views/credentials.py'
--- src/django_nova/views/credentials.py	2011-01-31 20:08:02 +0000
+++ src/django_nova/views/credentials.py	2011-02-13 02:22:10 +0000
@@ -17,7 +17,8 @@
 #    under the License.
 
 """
-Views for downloading X509 credentials.
+Views for downloading X509 credentials. Useful when using an invitation
+style system for configuring first time users.
 """
 
 from django import http
@@ -26,7 +27,8 @@
 from django_nova import models
 
 
-def download_credentials(request, auth_token):
+def authorize_credentials(request, auth_token):
+    """Sends X509 credentials to user if their auth token is valid."""
     auth_token = auth_token.lower()
     credentials = models.CredentialsAuthorization.get_by_token(auth_token)
 
 
=== modified file 'src/django_nova/views/volumes.py'
--- src/django_nova/views/volumes.py	2011-01-25 23:16:49 +0000
+++ src/django_nova/views/volumes.py	2011-02-13 02:22:10 +0000
@@ -26,14 +26,14 @@
 from django.shortcuts import redirect, render_to_response
 from django_nova import exceptions
 from django_nova import forms
+from django_nova import shortcuts
 from django_nova.exceptions import handle_nova_error
-from django_nova.shortcuts import get_project_or_404
 
 
 @login_required
 @handle_nova_error
 def index(request, project_id):
-    project = get_project_or_404(request, project_id)
+    project = shortcuts.get_project_or_404(request, project_id)
     volumes = project.get_volumes()
 
     return render_to_response('django_nova/volumes/index.html', {
@@ -48,7 +48,7 @@
 @login_required
 @handle_nova_error
 def add(request, project_id):
-    project = get_project_or_404(request, project_id)
+    project = shortcuts.get_project_or_404(request, project_id)
 
     if request.method == 'POST':
         form = forms.CreateVolumeForm(request.POST)
@@ -81,7 +81,7 @@
 @login_required
 @handle_nova_error
 def delete(request, project_id, volume_id):
-    project = get_project_or_404(request, project_id)
+    project = shortcuts.get_project_or_404(request, project_id)
 
     if request.method == 'POST':
         try:
@@ -100,7 +100,7 @@
 @login_required
 @handle_nova_error
 def attach(request, project_id):
-    project = get_project_or_404(request, project_id)
+    project = shortcuts.get_project_or_404(request, project_id)
 
     if request.method == 'POST':
         form = forms.AttachVolumeForm(project, request.POST)
@@ -135,7 +135,7 @@
 @login_required
 @handle_nova_error
 def detach(request, project_id, volume_id):
-    project = get_project_or_404(request, project_id)
+    project = shortcuts.get_project_or_404(request, project_id)
 
     if request.method == 'POST':
         try: