Merge branch 'feature-nose' into 'master'

Feature Nose

circle/circle/settings/test.py

@@ -35,7 +35,11 @@ SOUTH_TESTS_MIGRATE = False
 
 
 INSTALLED_APPS += (
 INSTALLED_APPS += (
     'acl.tests',
     'acl.tests',
+    'django_nose',
 )
 )
+TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
+NOSE_ARGS = ['--with-doctest']
+PASSWORD_HASHERS = ['django.contrib.auth.hashers.MD5PasswordHasher']
 
 
 CACHES = {
 CACHES = {
     'default': {
     'default': {

circle/common/models.py

@@ -78,11 +78,11 @@ activity_code_separator = '.'
 def has_prefix(activity_code, *prefixes):
 def has_prefix(activity_code, *prefixes):
     """Determine whether the activity code has the specified prefix.
     """Determine whether the activity code has the specified prefix.
 
 
-    E.g.: has_prefix('foo.bar.buz', 'foo.bar') == True
-          has_prefix('foo.bar.buz', 'foo', 'bar') == True
-          has_prefix('foo.bar.buz', 'foo.bar', 'buz') == True
-          has_prefix('foo.bar.buz', 'foo', 'bar', 'buz') == True
-          has_prefix('foo.bar.buz', 'foo', 'buz') == False
+    >>> assert has_prefix('foo.bar.buz', 'foo.bar')
+    >>> assert has_prefix('foo.bar.buz', 'foo', 'bar')
+    >>> assert has_prefix('foo.bar.buz', 'foo.bar', 'buz')
+    >>> assert has_prefix('foo.bar.buz', 'foo', 'bar', 'buz')
+    >>> assert not has_prefix('foo.bar.buz', 'foo', 'buz')
     """
     """
     equal = lambda a, b: a == b
     equal = lambda a, b: a == b
     act_code_parts = split_activity_code(activity_code)
     act_code_parts = split_activity_code(activity_code)
@@ -93,11 +93,11 @@ def has_prefix(activity_code, *prefixes):
 def has_suffix(activity_code, *suffixes):
 def has_suffix(activity_code, *suffixes):
     """Determine whether the activity code has the specified suffix.
     """Determine whether the activity code has the specified suffix.
 
 
-    E.g.: has_suffix('foo.bar.buz', 'bar.buz') == True
-          has_suffix('foo.bar.buz', 'bar', 'buz') == True
-          has_suffix('foo.bar.buz', 'foo.bar', 'buz') == True
-          has_suffix('foo.bar.buz', 'foo', 'bar', 'buz') == True
-          has_suffix('foo.bar.buz', 'foo', 'buz') == False
+    >>> assert has_suffix('foo.bar.buz', 'bar.buz')
+    >>> assert has_suffix('foo.bar.buz', 'bar', 'buz')
+    >>> assert has_suffix('foo.bar.buz', 'foo.bar', 'buz')
+    >>> assert has_suffix('foo.bar.buz', 'foo', 'bar', 'buz')
+    >>> assert not has_suffix('foo.bar.buz', 'foo', 'buz')
     """
     """
     equal = lambda a, b: a == b
     equal = lambda a, b: a == b
     act_code_parts = split_activity_code(activity_code)
     act_code_parts = split_activity_code(activity_code)

circle/dashboard/fixtures/test-vm-fixture.json

@@ -1322,7 +1322,7 @@
     "user_permissions": [
     "user_permissions": [
       115
       115
     ], 
     ], 
-    "password": "pbkdf2_sha256$10000$KIoeMs78MiOj$PnVXn3YJMehbOciBO32CMzqL0ZnQrzrdb7+b5dE13os=", 
+    "password": "md5$qLN4mQMOrsUJ$f07129fd1a289a0afb4e09f7a6816a4f",
     "email": "test@example.org", 
     "email": "test@example.org", 
     "date_joined": "2013-09-04T15:29:49.914Z"
     "date_joined": "2013-09-04T15:29:49.914Z"
   }
   }

requirements/base.txt

@@ -21,7 +21,6 @@ kombu==3.0.15
 logutils==0.3.3
 logutils==0.3.3
 MarkupSafe==0.21
 MarkupSafe==0.21
 netaddr==0.7.11
 netaddr==0.7.11
-nose==1.3.1
 pip-tools==0.3.4
 pip-tools==0.3.4
 psycopg2==2.5.2
 psycopg2==2.5.2
 Pygments==1.6
 Pygments==1.6

requirements/test.txt

@@ -3,3 +3,5 @@
 coverage==3.7.1
 coverage==3.7.1
 factory-boy==2.3.1
 factory-boy==2.3.1
 mock==1.0.1
 mock==1.0.1
+django-nose==1.2
+nose==1.3.3