Fix --nose-verbosity option

Both Django and nosetests support --verbosity. There was code to support
nose's --verbosity as --nose-verbosity, but it was untested and broken.

django_nose/runner.py

@@ -149,21 +149,23 @@ def add_arguments(cls, parser):
 
         # Process nose optparse options
         for option in options:
-            # Skip any options also in Django options
+            # Gather options
             opt_long = option.get_opt_string()
-            if opt_long in django_options:
-                continue
             if option._short_opts:
                 opt_short = option._short_opts[0]
-                if opt_short in django_options:
-                    continue
             else:
                 opt_short = None
 
             # Rename nose's --verbosity to --nose-verbosity
             if opt_long == '--verbosity':
                 opt_long = '--nose-verbosity'
 
+            # Skip any options also in Django options
+            if opt_long in django_options:
+                continue
+            if opt_short and opt_short in django_options:
+                opt_short = None
+
             # Convert optparse attributes to argparse attributes
             option_attrs = {}
             for attr in option.ATTRS:

runtests.sh

@@ -165,6 +165,9 @@ django_test "./manage.py test unittests $NOINPUT" 4 'unittests'
 reset_env
 django_test "./manage.py test unittests --verbosity 1 $NOINPUT" 4 'argument option without equals'
 
+reset_env
+django_test "./manage.py test unittests --nose-verbosity=2 $NOINPUT" 4 'argument with equals'
+
 reset_env
 django_test "./manage.py test unittests --testrunner=testapp.custom_runner.CustomNoseTestSuiteRunner $NOINPUT" 4 'unittests with testrunner'