Merge 8b49704 into 34c2f17

jupyter · Feb 7, 2017 · 0bd0852 · 0bd0852
2 parents 34c2f17 + 8b49704
commit 0bd0852
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/nbgrader/tests/formgrader/conftest.py b/nbgrader/tests/formgrader/conftest.py
@@ -101,7 +101,7 @@ def _formgrader(request, manager_class, gradebook, tempdir):
     capabilities['loggingPrefs'] = {'browser': 'ALL'}
     capabilities['acceptSslCerts'] = True
     browser = webdriver.PhantomJS(
-        service_args=['--ignore-ssl-errors=true'],
+        service_args=['--ignore-ssl-errors=true', '--proxy-type=none'],
         desired_capabilities=capabilities,
         service_log_path=os.path.devnull)
     browser.set_page_load_timeout(10)

diff --git a/nbgrader/tests/nbextensions/conftest.py b/nbgrader/tests/nbextensions/conftest.py
@@ -191,7 +191,7 @@ def browser(request, tempdir, nbserver):
     capabilities = DesiredCapabilities.PHANTOMJS
     capabilities['loggingPrefs'] = {'browser': 'ALL'}
     browser = webdriver.PhantomJS(
-        service_args=['--cookies-file=/dev/null'],
+        service_args=['--cookies-file=/dev/null', '--proxy-type=none'],
         desired_capabilities=capabilities,
         service_log_path=os.path.devnull)
     browser.set_page_load_timeout(30)