Nox system test refactor #60

theacodes · 2016-10-27T23:35:45Z

No description provided.

theacodes · 2016-10-27T23:43:13Z

Not sure why travis is failing, I may have somehow broken the secrets. Will investigate tomorrow.

theacodes · 2016-10-27T23:45:35Z

Not sure why travis is failing, I may have somehow broken the secrets. Will investigate tomorrow.

nvm, I think I did something dumb so it's maybe fixed now. :)

dhermes

Mostly LGTM

.travis.yml

  - python: 2.7
-    env: TOXENV=py27-system SYSTEM_TEST=1 SKIP_APP_ENGINE_SYSTEM_TEST=1
+    env: TOXENV=py27-system SYSTEM_TEST=1 SKIP_APP_ENGINE_SYSTEM_TEST=1 CLOUD_SDK_ROOT=${HOME}/.cache/cloud-sdk


system_tests/nox.py

+# If set, this is where the environment setup will store the Cloud SDK.
+# If unset, it will download the SDK to a temporary directory.
+CLOUD_SDK_ROOT = os.environ.get('CLOUD_SDK_ROOT')
+if CLOUD_SDK_ROOT:


system_tests/nox.py

+# If unset, it will download the SDK to a temporary directory.
+CLOUD_SDK_ROOT = os.environ.get('CLOUD_SDK_ROOT')
+if CLOUD_SDK_ROOT:
+    CLOUD_SDK_ROOT = py.path.local(CLOUD_SDK_ROOT)


system_tests/nox.py

+if CLOUD_SDK_ROOT:
+    CLOUD_SDK_ROOT = py.path.local(CLOUD_SDK_ROOT)
+    CLOUD_SDK_ROOT.ensure(dir=True)
+if not CLOUD_SDK_ROOT:


system_tests/nox.py

+    """Downloads and installs the Google Cloud SDK."""
+
+    # If the sdk already exists, we don't need to do anything else.
+    if CLOUD_SDK_ROOT.join('google-cloud-sdk').exists():


system_tests/nox.py

+        '-O', str(tar_path))
+
+    # Extract the release.
+    prerun('tar', 'xzf', str(tar_path), '-C', str(CLOUD_SDK_ROOT))


system_tests/nox.py

+
+    # Run the install script.
+    prerun(
+        str(CLOUD_SDK_ROOT.join('google-cloud-sdk', 'install.sh')),


system_tests/nox.py

+        dest.remove()
+    py.path.local(application_default_credentials).copy(dest)
+
+    gcloud('auth', 'application-default', 'print-access-token')


system_tests/nox.py

+def session_default_explicit_service_account(session):
+    session.virtualenv = False
+    session.env['GOOGLE_APPLICATION_CREDENTIALS'] = SERVICE_ACCOUNT_FILE
+    session.env['EXPECT_PROJECT_ID'] = '1'


system_tests/nox.py

+    configure_cloud_sdk(AUTHORIZED_USER_FILE)
+
+    session.env[CLOUD_SDK_CONFIG_ENV] = str(CLOUD_SDK_ROOT)
+    session.run('pytest', '--pdb', 'test_default.py')


theacodes · 2016-10-28T04:44:07Z

@dhermes I did a bit of refactoring to remove the hacky usage of prerun, PTAL.

.travis.yml

@@ -38,4 +38,5 @@ deploy:
    repo: GoogleCloudPlatform/google-auth-library-python
 env:
  global:
-    secure: s6GdhJklftl8w/9WoETwLtvtKL4ledPA/TuBuqCXQxSuYWaPuTdRVcvoejGkHJpp7i/7v2T/0etYl+5koyskKm5+QZZweaaL7MAyjPGp+hmIaIlWQRz6w481NOf3i9uSmoQycssT0mNmwScNIqo+igbA2y14mr/e9aBuOcxNNzNzFQp2vaRMEju6q7xZMjYdcudUWL48vq9CoNa3X2ZArpqjkApR/TfYlG7glOj43NxuVDN4z9wIyUjaMHBfPgEhjaOaRyEFgEYITRwX1qDoXqcZdTVIq4Cn0uCH+Mvrz6Y+oUJGTJqH1k7N/DhzbSN9lJnVYaQW/yuvGHiGAwbb6Tcxiq2UqqhA9MfbPpmstDECs46v9Z3BT252KvYEQY7Q1v9g2gFhHvFGWISUxs80rnnPhEYfa11JoLvj2t8cowkE4pvj4OH32Eoyvc5H07hW3F5xpuF7Jt7N09TNZkUrpmiRJEhfrVNgjsrWO77/q5h8mXGd+9vYmz++yzKu+63x8x1MpeigGCG73Dpu9Otm5eydOZfpJ39ZfZWUb7G2JahgHaGweM9dmnpJtzHQgijmHjjfAx9jgnQ8IQz9nkFmyMI8H7HouwalnrJtpSSbvMqOQ0kiZhMzdBKH5pD3tjLgSlgA0pKelBwlooY6jGlj4LrtbDAxa6cZyXiFoqWpT1w=
+    - secure: s6GdhJklftl8w/9WoETwLtvtKL4ledPA/TuBuqCXQxSuYWaPuTdRVcvoejGkHJpp7i/7v2T/0etYl+5koyskKm5+QZZweaaL7MAyjPGp+hmIaIlWQRz6w481NOf3i9uSmoQycssT0mNmwScNIqo+igbA2y14mr/e9aBuOcxNNzNzFQp2vaRMEju6q7xZMjYdcudUWL48vq9CoNa3X2ZArpqjkApR/TfYlG7glOj43NxuVDN4z9wIyUjaMHBfPgEhjaOaRyEFgEYITRwX1qDoXqcZdTVIq4Cn0uCH+Mvrz6Y+oUJGTJqH1k7N/DhzbSN9lJnVYaQW/yuvGHiGAwbb6Tcxiq2UqqhA9MfbPpmstDECs46v9Z3BT252KvYEQY7Q1v9g2gFhHvFGWISUxs80rnnPhEYfa11JoLvj2t8cowkE4pvj4OH32Eoyvc5H07hW3F5xpuF7Jt7N09TNZkUrpmiRJEhfrVNgjsrWO77/q5h8mXGd+9vYmz++yzKu+63x8x1MpeigGCG73Dpu9Otm5eydOZfpJ39ZfZWUb7G2JahgHaGweM9dmnpJtzHQgijmHjjfAx9jgnQ8IQz9nkFmyMI8H7HouwalnrJtpSSbvMqOQ0kiZhMzdBKH5pD3tjLgSlgA0pKelBwlooY6jGlj4LrtbDAxa6cZyXiFoqWpT1w=


system_tests/nox.py

+    # This sets the config root to the tests' config root. This prevents
+    # our tests from clobbering a developer's configuration when running
+    # these tests locally.
+    session.env[CLOUD_SDK_CONFIG_ENV] = str(CLOUD_SDK_ROOT)


system_tests/nox.py


+# gcloud requires Python 2.7 and doesn't work on 3.x, so we need to tell it
+# where to find 2.7 when we're running in a 3.x environment.
+CLOUD_SDK_PYTHON_ENV = 'GCLOUD_PYTHON'


system_tests/nox.py

-    if CLOUD_SDK_ROOT.join('google-cloud-sdk').exists():
+    # Note that because of this we do not attempt to update the sdk -
+    # if the CLOUD_SDK_ROOT is cached, it will need to be periodically cleared.
+    if CLOUD_SDK_INSTALL_DIR.exists():


system_tests/nox.py

-    prerun(
-        str(CLOUD_SDK_ROOT.join('google-cloud-sdk', 'install.sh')),
+    session.run(
+        str(CLOUD_SDK_INSTALL_DIR.join('install.sh')),


system_tests/nox.py

+        dest = CLOUD_SDK_ROOT.join('application_default_credentials.json')
+        if dest.exists():
+            dest.remove()
+        py.path.local(application_default_credentials).copy(dest)


theacodes · 2016-10-28T06:01:55Z

No idea why travis is failing on py35-system, as there doesn't seem to be any output from the failing commands. Investigating now.

theacodes · 2016-10-28T06:12:22Z

V I C T O R Y

Jon Wayne Parrott added 4 commits October 27, 2016 14:42

Add basic noxfile to orchestrate system tests

f0408a8

Move explicit system tests to nox

c04985b

Add cloud sdk environment automation

92e24d3

Fix lint error

6d8addd

theacodes assigned dhermes Oct 27, 2016

Jon Wayne Parrott added 2 commits October 27, 2016 16:37

Fix travis.yaml

1ba1b37

(Maybe) fix travis secrets

a876b17

Fix call to py.path.remove

5fac77e

dhermes reviewed Oct 27, 2016

View reviewed changes

Address review comments

2becbf4

dhermes approved these changes Oct 28, 2016

View reviewed changes

Jon Wayne Parrott added 2 commits October 27, 2016 22:29

Address review comments

b2ca56b

Fixing function call

294792c

Jon Wayne Parrott added 2 commits October 27, 2016 23:07

Testing travis

f82ba10

Testing travis

ee0049c

theacodes merged commit bbc3943 into master Oct 28, 2016

theacodes deleted the nox-system-test-refactor branch October 28, 2016 06:12

theacodes unassigned dhermes Oct 11, 2018

Nox system test refactor #60

Nox system test refactor #60

Conversation

theacodes commented Oct 27, 2016

theacodes commented Oct 27, 2016

theacodes commented Oct 27, 2016

dhermes left a comment

Choose a reason for hiding this comment

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

theacodes commented Oct 28, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

theacodes commented Oct 28, 2016

theacodes commented Oct 28, 2016