Avoid testing all download URLs more than once per deployment

docker/bin/run_integration_tests.sh

@@ -25,6 +25,10 @@ case $1 in
     PLATFORM="Windows 7"
     MARK_EXPRESSION="sanity and not headless"
     ;;
+  download)
+    DRIVER=
+    MARK_EXPRESSION=download
+    ;;
   headless)
     DRIVER=
     MARK_EXPRESSION=headless

jenkins/branches/master.yml

@@ -12,6 +12,7 @@ integration_tests:
   usw:
     - firefox
     - headless
+    - download
   tokyo:
     - headless
   frankfurt:

jenkins/branches/prod.yml

@@ -13,6 +13,7 @@ apps:
 integration_tests:
   usw:
     - headless
+    - download
     - firefox
     - chrome
     - ie

jenkins/branches/run-integration-tests.yml

@@ -8,6 +8,7 @@ apps:
 integration_tests:
   usw:
     - headless
+    - download
     - firefox
     - chrome
     - ie

jenkins/utils.groovy

@@ -63,7 +63,7 @@ def integrationTestJob(propFileName, appURL='') {
                               usernameVariable: 'SAUCELABS_USERNAME',
                               passwordVariable: 'SAUCELABS_API_KEY']]) {
                 withEnv(["BASE_URL=${appURL}"]) {
-                    retry(3) {
+                    retry(2) {
                         try {
                             sh testScript
                         }

tests/functional/test_download.py

@@ -8,7 +8,7 @@ import requests
 
 
 def pytest_generate_tests(metafunc):
-    if 'not headless' in metafunc.config.option.markexpr:
+    if 'not download' in metafunc.config.option.markexpr:
         return  # test deslected by mark expression
     base_url = metafunc.config.option.base_url
     if not base_url:
@@ -35,7 +35,7 @@ def pytest_generate_tests(metafunc):
     metafunc.parametrize('url', argvalues)
 
 
-@pytest.mark.headless
+@pytest.mark.download
 @pytest.mark.nondestructive
 def test_download_links(url):
     r = requests.head(url, allow_redirects=True)

tests/functional/test_download_l10n.py

@@ -8,7 +8,7 @@ import requests
 
 
 def pytest_generate_tests(metafunc):
-    if 'not headless' in metafunc.config.option.markexpr:
+    if 'not download' in metafunc.config.option.markexpr:
         return  # test deslected by mark expression
     base_url = metafunc.config.option.base_url
     if not base_url:
@@ -41,7 +41,7 @@ def pytest_generate_tests(metafunc):
     metafunc.parametrize('url', argvalues)
 
 
-@pytest.mark.headless
+@pytest.mark.download
 @pytest.mark.nondestructive
 def test_localized_download_links(url):
     r = requests.head(url, allow_redirects=True)