Only run download test setup when tests are selected

docker/bin/run_integration_tests.sh

@@ -23,7 +23,7 @@ case $1 in
     BROWSER_NAME="internet explorer"
     BROWSER_VERSION="8.0"
     PLATFORM="Windows 7"
-    MARK_EXPRESSION="sanity and not headless"
+    MARK_EXPRESSION=sanity
     ;;
   download)
     DRIVER=

tests/functional/test_download.py

@@ -8,7 +8,8 @@ import requests
 
 
 def pytest_generate_tests(metafunc):
-    if 'not download' in metafunc.config.option.markexpr:
+    markexpr = metafunc.config.option.markexpr
+    if markexpr and markexpr != 'download':
         return  # test deslected by mark expression
     base_url = metafunc.config.option.base_url
     if not base_url:

tests/functional/test_download_l10n.py

@@ -8,8 +8,9 @@ import requests
 
 
 def pytest_generate_tests(metafunc):
-    if 'not download' in metafunc.config.option.markexpr:
-        return  # test deslected by mark expression
+    markexpr = metafunc.config.option.markexpr
+    if markexpr and markexpr != 'download':
+        return  # only run when specifically selected
     base_url = metafunc.config.option.base_url
     if not base_url:
         pytest.skip(