tests: rewrite logic for skipping VPCSC runs

Author: busunkim96

monitoring/noxfile.py

@@ -14,6 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Generated by synthtool. DO NOT EDIT!
+
 from __future__ import absolute_import
 import os
 import shutil
@@ -22,6 +24,12 @@
 
 
 LOCAL_DEPS = (os.path.join("..", "api_core"), os.path.join("..", "core"))
+BLACK_VERSION = "black==19.3b0"
+BLACK_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]
+
+if os.path.exists("samples"):
+    BLACK_PATHS.append("samples")
+
 
 @nox.session(python="3.7")
 def lint(session):
@@ -30,14 +38,8 @@ def lint(session):
     Returns a failure if the linters find linting errors or sufficiently
     serious code quality issues.
     """
-    session.install("flake8", "black", *LOCAL_DEPS)
-    session.run(
-        "black",
-        "--check",
-        "google",
-        "tests",
-        "docs",
-    )
+    session.install("flake8", BLACK_VERSION, *LOCAL_DEPS)
+    session.run("black", "--check", *BLACK_PATHS)
     session.run("flake8", "google", "tests")
 
 
@@ -46,18 +48,13 @@ def blacken(session):
     """Run black.
 
     Format code to uniform standard.
-    
+
     This currently uses Python 3.6 due to the automated Kokoro run of synthtool.
     That run uses an image that doesn't have 3.6 installed. Before updating this
     check the state of the `gcp_ubuntu_config` we use for that Kokoro run.
     """
-    session.install("black")
-    session.run(
-        "black",
-        "google",
-        "tests",
-        "docs",
-    )
+    session.install(BLACK_VERSION)
+    session.run("black", *BLACK_PATHS)
 
 
 @nox.session(python="3.7")
@@ -83,7 +80,7 @@ def default(session):
         "--cov-append",
         "--cov-config=.coveragerc",
         "--cov-report=",
-        "--cov-fail-under=97",
+        "--cov-fail-under=0",
         os.path.join("tests", "unit"),
         *session.posargs,
     )
@@ -121,20 +118,11 @@ def system(session):
     session.install("-e", "../test_utils/")
     session.install("-e", ".")
 
-    # Additional setup for VPCSC system tests
-    if os.environ.get("GOOGLE_CLOUD_TESTS_IN_VPCSC") != "true":
-        # Unset PROJECT_ID, since VPCSC system tests expect this to be a project
-        # within the VPCSC perimeter.
-        env = {
-            "PROJECT_ID": "",
-            "GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT": os.environ.get("PROJECT_ID"),
-        }
-
     # Run py.test against the system tests.
     if system_test_exists:
-        session.run("py.test", "--quiet", system_test_path, env=env, *session.posargs)
+        session.run("py.test", "--quiet", system_test_path, *session.posargs)
     if system_test_folder_exists:
-        session.run("py.test", "--quiet", system_test_folder_path, env=env, *session.posargs)
+        session.run("py.test", "--quiet", system_test_folder_path, *session.posargs)
 
 
 @nox.session(python="3.7")
@@ -149,21 +137,24 @@ def cover(session):
 
     session.run("coverage", "erase")
 
+
 @nox.session(python="3.7")
 def docs(session):
     """Build the docs for this library."""
 
-    session.install('-e', '.')
-    session.install('sphinx', 'alabaster', 'recommonmark')
+    session.install("-e", ".")
+    session.install("sphinx", "alabaster", "recommonmark")
 
-    shutil.rmtree(os.path.join('docs', '_build'), ignore_errors=True)
+    shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True)
     session.run(
-        'sphinx-build',
-        '-W',  # warnings as errors
-        '-T',  # show full traceback on exception
-        '-N',  # no colors
-        '-b', 'html',
-        '-d', os.path.join('docs', '_build', 'doctrees', ''),
-        os.path.join('docs', ''),
-        os.path.join('docs', '_build', 'html', ''),
+        "sphinx-build",
+        "-W",  # warnings as errors
+        "-T",  # show full traceback on exception
+        "-N",  # no colors
+        "-b",
+        "html",
+        "-d",
+        os.path.join("docs", "_build", "doctrees", ""),
+        os.path.join("docs", ""),
+        os.path.join("docs", "_build", "html", ""),
     )

monitoring/synth.py

@@ -94,6 +94,6 @@
 # Add templated files
 # ----------------------------------------------------------------------------
 templated_files = common.py_library(unit_cov_level=97, cov_level=97)
-s.move(templated_files, excludes=["noxfile.py"])
+s.move(templated_files)
 
 s.shell.run(["nox", "-s", "blacken"], hide_output=False)