Commit 29763a5f8930a55eeadb4bf792e7e7cf54477a38

Authored by Claude Paroz
1 parent 96b80da8

Moved test labels discovery

Showing 1 changed file with 6 additions and 7 deletions
@@ -38,16 +38,15 @@ settings.configure( @@ -38,16 +38,15 @@ settings.configure(
38 from django.test.runner import DiscoverRunner 38 from django.test.runner import DiscoverRunner
39 39
40 40
41 -def main(): 41 +def main(test_labels=None):
42 if django.VERSION >= (1, 7): 42 if django.VERSION >= (1, 7):
43 django.setup() 43 django.setup()
44 runner = DiscoverRunner(failfast=True, verbosity=1) 44 runner = DiscoverRunner(failfast=True, verbosity=1)
45 - if len(sys.argv) > 1:  
46 - test_labels = sys.argv[1:]  
47 - else:  
48 - test_labels = ['testapp']  
49 - failures = runner.run_tests(test_labels, interactive=True) 45 + failures = runner.run_tests(test_labels or ['testapp'], interactive=True)
50 sys.exit(failures) 46 sys.exit(failures)
51 47
52 if __name__ == '__main__': 48 if __name__ == '__main__':
53 - main() 49 + test_labels = None
  50 + if len(sys.argv) > 1:
  51 + test_labels = sys.argv[1:]
  52 + main(test_labels)
Please register or login to post a comment