Fixed #19854 -- Turn Django's own Selenium tests off by default.

This commit is contained in:
Carl Meyer 2013-02-25 10:14:42 -07:00
parent 6d52bcbb7c
commit 906dc8522a
4 changed files with 11 additions and 21 deletions

View file

@ -302,10 +302,9 @@ if __name__ == "__main__":
'LiveServerTestCase) is expected to run from. The default value '
'is localhost:8081.')
parser.add_option(
'--skip-selenium', action='store_true', dest='skip_selenium',
'--selenium', action='store_true', dest='selenium',
default=False,
help='Skip running Selenium tests even it Selenium itself is '
'installed. By default these tests are not skipped.')
help='Run the Selenium tests as well (if Selenium is installed)')
options, args = parser.parse_args()
if options.settings:
os.environ['DJANGO_SETTINGS_MODULE'] = options.settings
@ -318,8 +317,8 @@ if __name__ == "__main__":
if options.liveserver is not None:
os.environ['DJANGO_LIVE_TEST_SERVER_ADDRESS'] = options.liveserver
if options.skip_selenium:
os.environ['DJANGO_SKIP_SELENIUM_TESTS'] = '1'
if options.selenium:
os.environ['DJANGO_SELENIUM_TESTS'] = '1'
if options.bisect:
bisect_tests(options.bisect, options, args)