Mvdb/harvest command use argparse #527
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,14 +17,13 @@ | |
| import os | ||
| import sys | ||
| import traceback | ||
| from distutils.version import StrictVersion | ||
|
|
||
| import django | ||
| from django.conf import settings | ||
| from django.core.management import call_command | ||
| from django.core.management.base import BaseCommand, CommandError | ||
| from django.test.utils import setup_test_environment, teardown_test_environment | ||
|
|
||
| from lettuce import Runner | ||
| from lettuce import registry | ||
|
|
@@ -35,110 +34,103 @@ | |
| from lettuce.django.server import LettuceServerException | ||
|
|
||
|
|
||
| DJANGO_VERSION = StrictVersion(django.get_version()) | ||
|
|
||
|
|
||
| class Command(BaseCommand): | ||
| help = u'Run lettuce tests all along installed apps' | ||
| args = '[PATH to feature file or folder]' | ||
|
|
||
| if DJANGO_VERSION < StrictVersion('1.9'): | ||
|
There was a problem hiding this comment. This clause is unnecessary - we can just use There was a problem hiding this comment. This clause is unnecessary - we can just use There was a problem hiding this comment. yes you're right! it just breaks with Django 1.6, I'll remove There was a problem hiding this comment. I'll still support 1.6 here, and this will need to be removed when support for 1.6 is dropped (I don't think it is). This file still supports 1.6 (see below) There was a problem hiding this comment. Django 1.6 has long been unsupported by the Django team, so lettuce shouldn't jump through too many hoops to maintain support for this branch. The latest 1.6 release was a year and a half ago - https://docs.djangoproject.com/en/1.10/releases/1.6.11/ |
||
| requires_model_validation = False | ||
| else: | ||
| requires_system_checks = False | ||
|
|
||
| def add_arguments(self, parser): | ||
| parser.set_defaults(verbosity=3) # default verbosity is 3 | ||
| parser.add_argument( | ||
| '-a', '--apps', action='store', dest='apps', default='', | ||
| help='Run ONLY the django apps that are listed here. Comma separated' | ||
| ) | ||
| parser.add_argument( | ||
| '-A', '--avoid-apps', action='store', dest='avoid_apps', default='', | ||
| help='AVOID running the django apps that are listed here. Comma separated' | ||
| ) | ||
| parser.add_argument( | ||
| '-S', '--no-server', action='store_true', dest='no_server', default=False, | ||
| help="will not run django's builtin HTTP server" | ||
| ) | ||
| parser.add_argument( | ||
| '--nothreading', action='store_false', dest='use_threading', default=True, | ||
| help='Tells Django to NOT use threading.' | ||
| ) | ||
| parser.add_argument( | ||
| '-T', '--test-server', action='store_true', dest='test_database', | ||
| default=getattr(settings, "LETTUCE_USE_TEST_DATABASE", False), | ||
| help="will run django's builtin HTTP server using the test databases" | ||
| ) | ||
| parser.add_argument( | ||
| '-P', '--port', type=int, dest='port', | ||
| help="the port in which the HTTP server will run at" | ||
| ) | ||
| parser.add_argument( | ||
| '-d', '--debug-mode', action='store_true', dest='debug', default=False, | ||
| help="when put together with builtin HTTP server, forces django to run with settings.DEBUG=True" | ||
| ) | ||
| parser.add_argument( | ||
| '-s', '--scenarios', action='store', dest='scenarios', default=None, | ||
| help='Comma separated list of scenarios to run' | ||
| ) | ||
| parser.add_argument( | ||
| "-t", "--tag", dest="tags", type=str, action='append', default=None, | ||
| help='Tells lettuce to run the specified tags only; ' | ||
| 'can be used multiple times to define more tags' | ||
| '(prefixing tags with "-" will exclude them and ' | ||
| 'prefixing with "~" will match approximate words)' | ||
| ) | ||
| parser.add_argument( | ||
| '--with-xunit', action='store_true', dest='enable_xunit', default=False, | ||
| help='Output JUnit XML test results to a file' | ||
| ) | ||
| parser.add_argument( | ||
| '--smtp-queue', action='store_true', dest='smtp_queue', default=False, | ||
| help='Use smtp for mail queue (usefull with --no-server option' | ||
| ) | ||
| parser.add_argument( | ||
| '--xunit-file', action='store', dest='xunit_file', default=None, | ||
| help='Write JUnit XML to this file. Defaults to lettucetests.xml' | ||
| ) | ||
| parser.add_argument( | ||
| '--with-subunit', action='store_true', dest='enable_subunit', | ||
| default=False, help='Output Subunit test results to a file' | ||
| ) | ||
| parser.add_argument( | ||
| '--subunit-file', action='store', dest='subunit_file', default=None, | ||
| help='Write Subunit to this file. Defaults to subunit.bin' | ||
| ) | ||
| parser.add_argument( | ||
| '--with-jsonreport', action='store_true', dest='enable_jsonreport', | ||
| default=False, help='Output JSON test results to a file' | ||
| ) | ||
| parser.add_argument( | ||
| '--jsonreport-file', action='store', dest='jsonreport_file', | ||
| default=None, help='Write JSON report to this file. Defaults to lettucetests.json' | ||
| ) | ||
| parser.add_argument( | ||
| "--failfast", dest="failfast", default=False, | ||
| action="store_true", help='Stop running in the first failure' | ||
| ) | ||
| parser.add_argument( | ||
| "--pdb", dest="auto_pdb", default=False, action="store_true", | ||
| help='Launches an interactive debugger upon error' | ||
| ) | ||
| if DJANGO_VERSION < StrictVersion('1.7'): | ||
| # Django 1.7 introduces the --no-color flag. We must add the flag | ||
| # to be compatible with older django versions | ||
| parser.add_argument( | ||
| '--no-color', action='store_true', dest='no_color', | ||
| default=False, help="Don't colorize the command output." | ||
| ) | ||
|
|
||
| def get_paths(self, args, apps_to_run, apps_to_avoid): | ||
| if args: | ||
|
|
@@ -156,18 +148,17 @@ def get_paths(self, args, apps_to_run, apps_to_avoid): | |
| def handle(self, *args, **options): | ||
| setup_test_environment() | ||
|
|
||
| verbosity = options['verbosity'] | ||
| no_color = options.get('no_color', False) | ||
| apps_to_run = tuple(options['apps'].split(",")) | ||
| apps_to_avoid = tuple(options['avoid_apps'].split(",")) | ||
| run_server = not options['no_server'] | ||
| test_database = options['test_database'] | ||
| smtp_queue = options['smtp_queue'] | ||
| tags = options['tags'] | ||
| failfast = options['failfast'] | ||
| auto_pdb = options['auto_pdb'] | ||
| threading = options['use_threading'] | ||
|
|
||
| if test_database: | ||
| migrate_south = getattr(settings, "SOUTH_TESTS_MIGRATE", True) | ||
|
|
@@ -183,7 +174,7 @@ def handle(self, *args, **options): | |
| self._testrunner.setup_test_environment() | ||
| self._old_db_config = self._testrunner.setup_databases() | ||
|
|
||
| if DJANGO_VERSION < StrictVersion('1.7'): | ||
| call_command('syncdb', verbosity=0, interactive=False,) | ||
| if migrate_south: | ||
| call_command('migrate', verbosity=0, interactive=False,) | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this line gives an error on Django==1.8, so that's why I replaced it below with something smarter