Accept Sauce Labs own environment variables

pytest-dev · Apr 27, 2018 · de4572d · de4572d
1 parent 70d3cb2
commit de4572d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/docs/user_guide.rst b/docs/user_guide.rst
@@ -279,8 +279,10 @@ Sauce Labs
 To run your automated tests using `Sauce Labs <https://saucelabs.com/>`_, you
 must provide a valid username and API key. This can be done either by using
 a ``.saucelabs`` configuration file in the working directory or your home
-directory, or by setting the ``SAUCELABS_USERNAME`` and ``SAUCELABS_API_KEY``
-environment variables.
+directory, by setting the ``SAUCELABS_USERNAME`` and ``SAUCELABS_API_KEY``
+environment variables, or by using the environment variables as detailed
+`here <https://wiki.saucelabs.com/display/DOCS/
+Best+Practice%3A+Use+Environment+Variables+for+Authentication+Credentials>`_
 
 Alternatively, when using `Jenkins CI`_ declarative pipelines,
 credentials can be set as environment variables as follows:

diff --git a/pytest_selenium/drivers/saucelabs.py b/pytest_selenium/drivers/saucelabs.py
@@ -33,12 +33,14 @@ def name(self):
     @property
     def username(self):
         return self.get_credential('username', ['SAUCELABS_USERNAME',
-                                                'SAUCELABS_USR'])
+                                                'SAUCELABS_USR',
+                                                'SAUCE_USERNAME'])
 
     @property
     def key(self):
         return self.get_credential('key', ['SAUCELABS_API_KEY',
-                                           'SAUCELABS_PSW'])
+                                           'SAUCELABS_PSW',
+                                           'SAUCE_ACCESS_KEY'])
 
 
 @pytest.mark.optionalhook

diff --git a/testing/test_saucelabs.py b/testing/test_saucelabs.py
@@ -54,7 +54,9 @@ def test_missing_api_key_file(failure, monkeypatch, tmpdir):
 @pytest.mark.parametrize(('username', 'key'), [('SAUCELABS_USERNAME',
                                                 'SAUCELABS_API_KEY'),
                                                ('SAUCELABS_USR',
-                                                'SAUCELABS_PSW')])
+                                                'SAUCELABS_PSW'),
+                                               ('SAUCE_USERNAME',
+                                                'SAUCE_ACCESS_KEY')])
 def test_invalid_credentials_env(failure, monkeypatch, tmpdir, username, key):
     monkeypatch.setattr(os.path, 'expanduser', lambda p: str(tmpdir))
     monkeypatch.setenv(username, 'foo')