Merge remote-tracking branch 'origin/master'

.travis.yml

@@ -49,3 +49,5 @@ sudo: false
 notifications:
   webhooks:
     - https://buildtimetrend.herokuapp.com/travis
+addons:
+  sauce_connect: true

ci/run-selenium

@@ -3,7 +3,7 @@
 
 . ci/lib
 
-export CI_SELENIUM=1
+export DO_SELENIUM=1
 
 # We retry Selenium tests to workaroud occasional failures
 # in connection to SauceLabs

ci/setup-env

@@ -6,6 +6,3 @@ mysql -e 'DROP DATABASE IF EXISTS weblate;' -uroot
 mysql -e 'CREATE DATABASE weblate CHARACTER SET utf8 COLLATE utf8_general_ci;' -uroot
 psql -c 'DROP DATABASE IF EXISTS weblate;' -U postgres
 psql -c 'CREATE DATABASE weblate;' -U postgres
-if [ "$CI_MODE" = selenium -a -n "$SAUCE_USERNAME" -a -n "$SAUCE_ACCESS_KEY" ] ; then
-    curl -L https://gist.githubusercontent.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash 
-fi

weblate/trans/tests/test_selenium.py

@@ -18,7 +18,7 @@ from weblate.trans.tests import OverrideSettings
 
 # Check whether we should run Selenium tests
 DO_SELENIUM = (
-    ('DO_SELENIUM' in os.environ or 'CI_SELENIUM' in os.environ) and
+    'DO_SELENIUM' in os.environ and
     'SAUCE_USERNAME' in os.environ and
     'SAUCE_ACCESS_KEY' in os.environ
 )
@@ -79,7 +79,7 @@ class SeleniumTests(LiveServerTestCase, RegistrationTestMixin):
             cls.sauce_auth = base64.encodestring(
                 '{}:{}'.format(cls.username, cls.key)
             )[:-1]
-            hub_url = "{}:{}@localhost:4445".format(cls.username, cls.key)
+            hub_url = "{}:{}@ondemand.saucelabs.com".format(cls.username, cls.key)
             cls.driver = webdriver.Remote(
                 desired_capabilities=cls.caps,
                 command_executor="http://{}/wd/hub".format(hub_url)