Added new test deps to requirements file.

Plus tweaks to test method names

requirements.txt

@@ -13,4 +13,5 @@ twill==0.9
 PyHamcrest==1.6
 South==0.7.3
 purl==0.3.2
-django-sorting==0.1
+pinocchio==0.3.1
+nose-progressive==1.3

runtests.py

@@ -39,5 +39,4 @@ if __name__ == '__main__':
         print 'Generate HTML reports'
         c.html_report()
     else:
-        print 'Running tests'
         run_tests(options.verbosity, *args)

tests/config.py

@@ -55,6 +55,6 @@ def configure():
             HAYSTACK_SEARCH_ENGINE='dummy',
             HAYSTACK_SITECONF = 'oscar.search_sites',
             APPEND_SLASH=True,
-            NOSE_ARGS=['-s', '-x'],
+            NOSE_ARGS=['-s', '-x', '--with-spec'],
             **OSCAR_SETTINGS
         )

tests/unit/voucher_tests.py

@@ -5,16 +5,16 @@ from django.test import TestCase
 from oscar.apps.voucher.models import Voucher
 
 
-class VoucherTest(TestCase):
+class TestVoucher(TestCase):
     
-    def test_is_active(self):
+    def test_is_active_between_start_and_end_dates(self):
         start = datetime.date(2011, 01, 01)
         test = datetime.date(2011, 01, 10)
         end = datetime.date(2011, 02, 01)
         voucher = Voucher(start_date=start, end_date=end)
         self.assertTrue(voucher.is_active(test))
 
-    def test_is_inactive(self):
+    def test_is_inactive_outside_of_start_and_end_dates(self):
         start = datetime.date(2011, 01, 01)
         test = datetime.date(2011, 03, 10)
         end = datetime.date(2011, 02, 01)
@@ -27,7 +27,3 @@ class VoucherTest(TestCase):
         voucher = Voucher(name="Dummy voucher", code="lowercase", start_date=start, end_date=end)
         voucher.save()
         self.assertEquals("LOWERCASE", voucher.code)
-        
-
-    
-