Using nox session.skip (instead of ValueError) for system tests.

googleapis · Jul 18, 2017 · 7c2d7f1 · 7c2d7f1
1 parent 3625888
commit 7c2d7f1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: googleapis/nox:0.11.2
+      - image: googleapis/nox:0.17.0
     steps:
       - checkout
       - run:

diff --git a/nox.py b/nox.py
@@ -124,8 +124,12 @@ def system_tests(session, python_version):
     for env_var in SYSTEM_TEST_ENV_VARS:
         if env_var not in os.environ:
             missing.append(env_var)
+
+    # Only run system tests if the environment variables are set.
     if missing:
-        raise ValueError('Environment variable(s) unset', *missing)
+        all_vars = ', '.join(missing)
+        msg = 'Environment variable(s) unset: {}'.format(all_vars)
+        session.skip(msg)
 
     # Run the system tests against latest Python 2 and Python 3 only.
     session.interpreter = 'python{}'.format(python_version)
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ version: 2 @@
     jobs:
       build:
         docker:
-          - image: googleapis/nox:0.11.2
+          - image: googleapis/nox:0.17.0
         steps:
           - checkout
           - run:
@@ Expand Down @@