Use no-sandbox tag instead of local attribute or tag

mcx · Apr 17, 2018 · 810a9e6 · 810a9e6
1 parent 87ed4b3
commit 810a9e6
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 43 deletions.
diff --git a/automotive/BUILD.bazel b/automotive/BUILD.bazel
@@ -488,7 +488,6 @@ drake_cc_googletest(
     data = ["//automotive/models:prod_models"],
     # Flaky because LCM self-test can fail (PR #7311)
     flaky = 1,
-    local = 1,
     deps = [
         "//automotive:automotive_simulator",
         "//automotive:create_trajectory_params",

diff --git a/lcm/BUILD.bazel b/lcm/BUILD.bazel
@@ -95,7 +95,6 @@ drake_cc_googletest(
     name = "drake_lcm_test",
     # Flaky because LCM self-test can fail (PR #7311)
     flaky = 1,
-    local = 1,
     deps = [
         ":lcm",
         ":lcmt_drake_signal_utils",
@@ -104,7 +103,6 @@ drake_cc_googletest(
 
 drake_cc_googletest(
     name = "drake_lcm_log_test",
-    local = 1,
     deps = [
         ":lcm_log",
         ":lcmt_drake_signal_utils",

diff --git a/manipulation/models/iiwa_description/BUILD.bazel b/manipulation/models/iiwa_description/BUILD.bazel
@@ -19,7 +19,6 @@ drake_cc_googletest(
     name = "dual_iiwa14_polytope_collision_test",
     srcs = ["urdf/test/dual_iiwa14_polytope_collision_test.cc"],
     data = [":models"],
-    local = 1,
     deps = [
         "//common:find_resource",
         "//multibody/parsers",

diff --git a/manipulation/models/wsg_50_description/BUILD.bazel b/manipulation/models/wsg_50_description/BUILD.bazel
@@ -17,7 +17,6 @@ drake_cc_googletest(
     name = "wsg_50_mesh_collision_test",
     srcs = ["urdf/test/wsg50_mesh_collision_test.cc"],
     data = [":models"],
-    local = 1,
     deps = [
         "//common:find_resource",
         "//multibody/parsers",

diff --git a/systems/sensors/BUILD.bazel b/systems/sensors/BUILD.bazel
@@ -422,14 +422,14 @@ drake_cc_googletest(
     data = [
         ":test_models",
     ],
-    # Mitigates driver-related issues when running under `bazel test`. For more
-    # information, see #7004.
-    local = 1,
-    # Disable under LeakSanitizer and Valgrind Memcheck due to driver-related
-    # leaks. For more information, see #7520.
     tags = [
+        # Disable under LeakSanitizer and Valgrind Memcheck due to
+        # driver-related leaks. For more information, see #7520.
         "no_lsan",
         "no_memcheck",
+        # Mitigates driver-related issues when running under `bazel test`. For
+        # more information, see #7004.
+        "no-sandbox",
     ],
     deps = [
         ":rgbd_camera",
@@ -452,14 +452,14 @@ drake_cc_googletest(
     data = [
         ":test_models",
     ],
-    # Mitigates driver-related issues when running under `bazel test`. For more
-    # information, see #7004.
-    local = 1,
-    # Disable under LeakSanitizer and Valgrind Memcheck due to driver-related
-    # leaks. For more information, see #7520.
     tags = [
+        # Disable under LeakSanitizer and Valgrind Memcheck due to
+        # driver-related leaks. For more information, see #7520.
         "no_lsan",
         "no_memcheck",
+        # Mitigates driver-related issues when running under `bazel test`. For
+        # more information, see #7004.
+        "no-sandbox",
     ],
     deps = [
         ":rgbd_renderer",
@@ -480,18 +480,19 @@ sh_test(
     data = [
         ":test_models",
     ],
-    # Mitigates driver-related issues when running under `bazel test`. For more
-    # information, see #7004.
-    local = 1,
-    # TODO(mitiguy) Issue #8368: Test rgbd_camera_publish_lcm_test in the
-    # BUILD.bazel file in directory drake/systems/sensors cannot be run anymore
-    # due to the new RotationMatrix class which insists on being a proper
-    # orthogonal rotation matrix.  This test produces a quaternion with NANs
-    # which causes the RotationMatrix class to throw an exception in debug
-    # builds. This test is labeled with tags = "manual" so CI does not run it.
-    # This test is defective and should never have passed earlier code review.
     tags = [
+        # TODO(mitiguy) Issue #8368: Test rgbd_camera_publish_lcm_test in the
+        # BUILD.bazel file in directory drake/systems/sensors cannot be run
+        # anymore due to the new RotationMatrix class which insists on being a
+        # proper orthogonal rotation matrix.  This test produces a quaternion
+        # with NANs which causes the RotationMatrix class to throw an exception
+        # in debug builds. This test is labeled with tags = "manual" so CI does
+        # not run it. This test is defective and should never have passed
+        # earlier code review.
         "manual",
+        # Mitigates driver-related issues when running under `bazel test`. For
+        # more information, see #7004.
+        "no-sandbox",
     ],
 )
 

diff --git a/tools/lint/BUILD.bazel b/tools/lint/BUILD.bazel
@@ -92,9 +92,13 @@ drake_py_unittest(
 drake_py_unittest(
     name = "util_test",
     tags = [
-        # This test looks outside the sandbox.
+        # This test's pass/fail result depends on the presence of files in the
+        # source tree beyond what is declared in its `deps`; thus, we need to
+        # re-run the test anytime the source tree might have changed, for which
+        # "external" is the closest semantic match.
         "external",
-        "local",
+        # This test looks outside the sandbox.
+        "no-sandbox",
     ],
     deps = [":util"],
 )

diff --git a/tools/skylark/test_tags.bzl b/tools/skylark/test_tags.bzl
@@ -1,45 +1,42 @@
 # -*- mode: python -*-
 
 # These macros are intended to be used when declaring tests that either may-use
-# or must-use either Gurobi or Mosek commercial solvers.  These labels both
-# account for any license-server specific needs (such as network access or rate
-# control), as well as provide a marker so that //tools/bazel.rc can
-# selectively enable tests based on the developer's chosen configuration.
+# or must-use either Gurobi or MOSEK commercial solvers. These labels both
+# account for any license-related needs and provide a marker so that
+# //tools/bazel.rc can selectively enable tests based on the developer's chosen
+# configuration.
 
 def gurobi_test_tags(gurobi_required = True):
     """Returns the test tags necessary for properly running Gurobi tests.
 
     By default, sets gurobi_required=True, which will require that the supplied
     tag filters include "gurobi".
 
-    Gurobi checks a license file, and may need to contact a license server to
-    check out a license. Therefore, tests that use Gurobi must have the tag
-    "local", because they are non-hermetic. For the moment, we also require
-    the tag "exclusive", to rate-limit license servers with a small number of
-    licenses.
+    Gurobi checks a license file outside the workspace so tests that use Gurobi
+    must have the tag "no-sandbox". For the moment, we also require the tag
+    "exclusive" to rate-limit license servers with a small number of licenses.
     """
     # TODO(david-german-tri): Find a better fix for the license server problem.
     nominal_tags = [
-        "exclusive",
-        "local",
+        "exclusive",  # implies "local"
+        "no-sandbox",
     ]
     if gurobi_required:
         return nominal_tags + ["gurobi"]
     else:
         return nominal_tags
 
 def mosek_test_tags(mosek_required = True):
-    """Returns the test tags necessary for properly running mosek tests.
+    """Returns the test tags necessary for properly running MOSEK tests.
 
     By default, sets mosek_required=True, which will require that the supplied
     tag filters include "mosek".
 
-    MOSEK checks a license file, and may need to contact a license server to
-    check out a license. Therefore, tests that use MOSEK must have the tag
-    "local", because they are non-hermetic.
+    MOSEK checks a license file outside the workspace, so tests that use MOSEK
+    must have the tag "no-sandbox".
     """
     nominal_tags = [
-        "local",
+        "no-sandbox",
     ]
     if mosek_required:
         return nominal_tags + ["mosek"]