diff options
| author | Kenneth Skovhede <kenneth@hexad.dk> | 2016-09-29 15:48:39 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-29 15:48:39 +0300 |
| commit | f04a919df7ae11e859ac7e11a4610032a64bc655 (patch) | |
| tree | ce8b0c7a5bd711c8103835be71b459744c38dc5c | |
| parent | a65efc4e65050b4b5486d10afc22979621f16377 (diff) | |
| parent | 217cfc4d1cafd7b56bf0416c6b0029edbf2c94b1 (diff) | |
Merge pull request #1960 from agrajaghh/travis_parallel
use 2 parallel travis jobs
| -rw-r--r-- | .travis.yml | 17 | ||||
| -rw-r--r-- | guiTests/guiTest.py | 8 |
2 files changed, 14 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 098d8dbe4..75544b24a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,9 @@ env: general: - USAGEREPORTER_Duplicati_LEVEL=none - AUTOUPDATER_Duplicati_SKIP_UPDATE=1 + matrix: + - JOB=job1 + - JOB=job2 notifications: webhooks: urls: @@ -43,23 +46,23 @@ script: - echo "travis_fold:end:download_extract_testdata" # run unit tests - echo "travis_fold:start:unit_tests_border" - - mono ./testrunner/NUnit.ConsoleRunner.3.4.1/tools/nunit3-console.exe ./Duplicati/UnitTest/bin/Release/Duplicati.UnitTest.dll --where:cat==Border --workers=1 + - if [[ "$JOB" == "job1" ]]; then mono ./testrunner/NUnit.ConsoleRunner.3.4.1/tools/nunit3-console.exe ./Duplicati/UnitTest/bin/Release/Duplicati.UnitTest.dll --where:cat==Border --workers=1; fi - echo "travis_fold:end:unit_tests_border" - echo "travis_fold:start:unit_tests_bulknormal" - - mono ./testrunner/NUnit.ConsoleRunner.3.4.1/tools/nunit3-console.exe ./Duplicati/UnitTest/bin/Release/Duplicati.UnitTest.dll --where:cat==BulkNormal --workers=1 + - if [[ "$JOB" == "job2" ]]; then mono ./testrunner/NUnit.ConsoleRunner.3.4.1/tools/nunit3-console.exe ./Duplicati/UnitTest/bin/Release/Duplicati.UnitTest.dll --where:cat==BulkNormal --workers=1; fi - echo "travis_fold:end:unit_tests_bulknormal" - echo "travis_fold:start:unit_tests_bulknosize" - - mono ./testrunner/NUnit.ConsoleRunner.3.4.1/tools/nunit3-console.exe ./Duplicati/UnitTest/bin/Release/Duplicati.UnitTest.dll --where:cat==BulkNoSize --workers=1 + - if [[ "$JOB" == "job2" ]]; then mono ./testrunner/NUnit.ConsoleRunner.3.4.1/tools/nunit3-console.exe ./Duplicati/UnitTest/bin/Release/Duplicati.UnitTest.dll --where:cat==BulkNoSize --workers=1; fi - echo "travis_fold:end:unit_tests_bulknosize" - echo "travis_fold:start:unit_tests_svndata" - - mono ./testrunner/NUnit.ConsoleRunner.3.4.1/tools/nunit3-console.exe ./Duplicati/UnitTest/bin/Release/Duplicati.UnitTest.dll --where:cat==SVNData --workers=1 + - if [[ "$JOB" == "job1" ]]; then mono ./testrunner/NUnit.ConsoleRunner.3.4.1/tools/nunit3-console.exe ./Duplicati/UnitTest/bin/Release/Duplicati.UnitTest.dll --where:cat==SVNData --workers=1; fi - echo "travis_fold:end:unit_tests_svndata" - echo "travis_fold:start:unit_tests_svndatalong" - - mono ./testrunner/NUnit.ConsoleRunner.3.4.1/tools/nunit3-console.exe ./Duplicati/UnitTest/bin/Release/Duplicati.UnitTest.dll --where:cat==SVNDataLong --workers=1 + - if [[ "$JOB" == "job1" ]]; then mono ./testrunner/NUnit.ConsoleRunner.3.4.1/tools/nunit3-console.exe ./Duplicati/UnitTest/bin/Release/Duplicati.UnitTest.dll --where:cat==SVNDataLong --workers=1; fi - echo "travis_fold:end:unit_tests_svndatalong" - echo "travis_fold:start:unit_tests_targeted" - - mono ./testrunner/NUnit.ConsoleRunner.3.4.1/tools/nunit3-console.exe ./Duplicati/UnitTest/bin/Release/Duplicati.UnitTest.dll --where:cat==Targeted --workers=1 + - if [[ "$JOB" == "job1" ]]; then mono ./testrunner/NUnit.ConsoleRunner.3.4.1/tools/nunit3-console.exe ./Duplicati/UnitTest/bin/Release/Duplicati.UnitTest.dll --where:cat==Targeted --workers=1; fi - echo "travis_fold:end:unit_tests_targeted" # start server and run gui tests - mono ./Duplicati/GUI/Duplicati.GUI.TrayIcon/bin/Release/Duplicati.Server.exe & - - python guiTests/guiTest.py + - if [[ "$JOB" == "job2" ]]; then python guiTests/guiTest.py; fi diff --git a/guiTests/guiTest.py b/guiTests/guiTest.py index 616a537a1..b42281152 100644 --- a/guiTests/guiTest.py +++ b/guiTests/guiTest.py @@ -9,11 +9,11 @@ from selenium.webdriver.common.by import By from selenium.webdriver.support.ui import WebDriverWait from selenium.webdriver.support import expected_conditions -if not "SAUCE_USERNAME" in os.environ: - print "No sauce labs login credentials found. Stopping tests..." - sys.exit(0) - if "TRAVIS_BUILD_NUMBER" in os.environ: + if not "SAUCE_USERNAME" in os.environ: + print "No sauce labs login credentials found. Stopping tests..." + sys.exit(0) + capabilities = {'browserName': "firefox"} capabilities['platform'] = "Windows 7" capabilities['version'] = "48.0" |