x/tuskar-ui
Code Issues Proposed changes

Merge "Display form with initial input and error after failure to import keypair"

Browse Source
This commit is contained in:
Jenkins 2012-07-25 00:59:44 +00:00 committed by Gerrit Code Review
commit 6c766326b5
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
horizon/dashboards/nova/access_and_security/keypairs/forms.py
View File

@ -61,6 +61,6 @@ class ImportKeypair(forms.SelfHandlingForm):
% data['name'])
return keypair
except:
exceptions.handle(request,
_('Unable to import keypair.'))
return shortcuts.redirect(request.build_absolute_uri())
exceptions.handle(request, ignore=True)
self.api_error(_('Unable to import keypair.'))
return False

18
horizon/dashboards/nova/access_and_security/keypairs/tests.py
View File

@ -127,6 +127,24 @@ class KeyPairViewTests(test.TestCase):
res = self.client.post(url, formData)
self.assertMessageCount(res, success=1)
def test_import_keypair_invalid_key(self):
key_name = "new key pair"
public_key = "ABCDEF"
self.mox.StubOutWithMock(api, 'keypair_import')
api.keypair_import(IsA(http.HttpRequest), key_name, public_key) \
.AndRaise(self.exceptions.nova)
self.mox.ReplayAll()
formData = {'method': 'ImportKeypair',
'name': key_name,
'public_key': public_key}
url = reverse('horizon:nova:access_and_security:keypairs:import')
res = self.client.post(url, formData, follow=True)
self.assertEqual(res.redirect_chain, [])
msg = 'Unable to import keypair.'
self.assertFormErrors(res, count=1, message=msg)
def test_generate_keypair_exception(self):
keypair = self.keypairs.first()