Download as
Browse Code »

Commit 1aafcce7ae5e054ff71dde4f7a36dc86086a7c3e

Authored by Alexandre Barbosa
1 parent c4dd802c
Exists in master and in 3 other branches 1.12.x, fix-dashboard, fix-message-preview

Fixing flake8 

Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Lucas Moura <lucas.moura128@gmail.com>
Showing 1 changed file with 5 additions and 7 deletions   Show diff stats
colab/accounts/tests/test_forms.py
  Diff comments   View file @1aafcce
@@ -8,7 +8,6 @@ from mock import patch @@ -8,7 +8,6 @@ from mock import patch
8 8
9 from django.test import TestCase, override_settings 9 from django.test import TestCase, override_settings
10 from django.core.urlresolvers import reverse 10 from django.core.urlresolvers import reverse
11 -from django.forms import ValidationError  
12 11
13 from colab.accounts.forms import (UserCreationForm, UserChangeForm, 12 from colab.accounts.forms import (UserCreationForm, UserChangeForm,
14 UserUpdateForm, UserForm, get_lists_choices, 13 UserUpdateForm, UserForm, get_lists_choices,
@@ -282,7 +281,7 @@ class UserCreationFormTestCase(TestCase): @@ -282,7 +281,7 @@ class UserCreationFormTestCase(TestCase):
282 creation_form = UserCreationForm( 281 creation_form = UserCreationForm(
283 data=self.get_form_data('teste1234@example.com')) 282 data=self.get_form_data('teste1234@example.com'))
284 self.assertFalse(creation_form.is_valid()) 283 self.assertFalse(creation_form.is_valid())
285 - self.assertTrue(creation_form.errors.has_key('email')) 284 + self.assertTrue('email' in creation_form.errors)
286 self.assertEqual(1, len(creation_form.errors)) 285 self.assertEqual(1, len(creation_form.errors))
287 286
288 def test_clean_mail(self): 287 def test_clean_mail(self):
@@ -295,7 +294,7 @@ class UserCreationFormTestCase(TestCase): @@ -295,7 +294,7 @@ class UserCreationFormTestCase(TestCase):
295 data=self.get_form_data('teste12345@example.com', 294 data=self.get_form_data('teste12345@example.com',
296 username='user1234')) 295 username='user1234'))
297 self.assertFalse(creation_form.is_valid()) 296 self.assertFalse(creation_form.is_valid())
298 - self.assertTrue(creation_form.errors.has_key('username')) 297 + self.assertTrue('username' in creation_form.errors)
299 self.assertEqual(1, len(creation_form.errors)) 298 self.assertEqual(1, len(creation_form.errors))
300 299
301 def test_clean_username(self): 300 def test_clean_username(self):
@@ -304,14 +303,13 @@ class UserCreationFormTestCase(TestCase): @@ -304,14 +303,13 @@ class UserCreationFormTestCase(TestCase):
304 username='user12345')) 303 username='user12345'))
305 self.assertTrue(creation_form.is_valid()) 304 self.assertTrue(creation_form.is_valid())
306 305
307 -  
308 def test_clean_password2_empty_password1(self): 306 def test_clean_password2_empty_password1(self):
309 creation_form = UserCreationForm( 307 creation_form = UserCreationForm(
310 data=self.get_form_data('teste12345@example.com', 308 data=self.get_form_data('teste12345@example.com',
311 username='user12345', 309 username='user12345',
312 password1='')) 310 password1=''))
313 self.assertFalse(creation_form.is_valid()) 311 self.assertFalse(creation_form.is_valid())
314 - self.assertTrue(creation_form.errors.has_key('password1')) 312 + self.assertTrue('password1' in creation_form.errors)
315 self.assertEqual(1, len(creation_form.errors)) 313 self.assertEqual(1, len(creation_form.errors))
316 314
317 def test_clean_password2_empty_password2(self): 315 def test_clean_password2_empty_password2(self):
@@ -320,7 +318,7 @@ class UserCreationFormTestCase(TestCase): @@ -320,7 +318,7 @@ class UserCreationFormTestCase(TestCase):
320 username='user12345', 318 username='user12345',
321 password2='')) 319 password2=''))
322 self.assertFalse(creation_form.is_valid()) 320 self.assertFalse(creation_form.is_valid())
323 - self.assertTrue(creation_form.errors.has_key('password2')) 321 + self.assertTrue('password2' in creation_form.errors)
324 322
325 def test_clean_password2_different_passwords(self): 323 def test_clean_password2_different_passwords(self):
326 creation_form = UserCreationForm( 324 creation_form = UserCreationForm(
@@ -328,7 +326,7 @@ class UserCreationFormTestCase(TestCase): @@ -328,7 +326,7 @@ class UserCreationFormTestCase(TestCase):
328 username='user12345', 326 username='user12345',
329 password1='1234')) 327 password1='1234'))
330 self.assertFalse(creation_form.is_valid()) 328 self.assertFalse(creation_form.is_valid())
331 - self.assertTrue(creation_form.errors.has_key('password2')) 329 + self.assertTrue('password2' in creation_form.errors)
332 self.assertEqual(1, len(creation_form.errors)) 330 self.assertEqual(1, len(creation_form.errors))
333 self.assertEqual(1, len(creation_form.errors)) 331 self.assertEqual(1, len(creation_form.errors))
334 332