Merge upstream tensorflow/tensorboard: resolve CI test failures (tensorflow#7055)

Pull upstream commit 3ad0c35 which resolves CI test failures:
- Add Chrome dependencies (libgbm-dev, libxss1, libasound2) to CI workflow
- Add 'exclusive' tag to manager_test and program_test BUILD targets
- Fix manager_test expected debug call count (2 -> 3)
- Broaden exception handling in program_test for IPv6 bind failures

Conflicts resolved in tensorbored/BUILD:
- Kept fork's tensorbored/defs paths with upstream's load reordering
- Accepted upstream's 'exclusive' tag for manager_test with fork's visibility path

Co-authored-by: Samuel <samuel@knutsen.co>

Author: cursoragent

.github/workflows/ci.yml

@@ -83,6 +83,10 @@ jobs:
             -r ./tensorbored/pip_package/requirements.txt \
             -r ./tensorbored/pip_package/requirements_dev.txt \
             ;
+      - name: 'Install Chrome dependencies'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgbm-dev libxss1 libasound2
       - name: 'Check Pip state'
         run: pip freeze --all
       - name: 'Bazel: fetch'

tensorbored/BUILD

@@ -1,12 +1,12 @@
 # Description:
 # TensorBoard, a dashboard for investigating TensorFlow
 
-load("//tensorbored/defs:py_repl.bzl", "py_repl")
-load("//tensorbored/defs:web.bzl", "tf_web_library")
-load("//tensorbored/defs:zipper.bzl", "tensorboard_zip_file")
 load("@rules_python//python:py_binary.bzl", "py_binary")
 load("@rules_python//python:py_library.bzl", "py_library")
 load("@rules_python//python:py_test.bzl", "py_test")
+load("//tensorbored/defs:py_repl.bzl", "py_repl")
+load("//tensorbored/defs:web.bzl", "tf_web_library")
+load("//tensorbored/defs:zipper.bzl", "tensorboard_zip_file")
 
 package(default_visibility = [":internal"])
 
@@ -212,10 +212,13 @@ py_library(
 
 py_test(
     name = "manager_test",
-    size = "small",
+    size = "large",
     srcs = ["manager_test.py"],
     srcs_version = "PY3",
-    tags = ["support_notf"],
+    tags = [
+        "exclusive",
+        "support_notf",
+    ],
     visibility = ["//tensorbored:internal"],
     deps = [
         ":manager",
@@ -274,10 +277,13 @@ py_library(
 
 py_test(
     name = "program_test",
-    size = "small",
+    size = "large",
     srcs = ["program_test.py"],
     srcs_version = "PY3",
-    tags = ["support_notf"],
+    tags = [
+        "exclusive",
+        "support_notf",
+    ],
     deps = [
         ":default",
         ":program",

tensorbored/manager_test.py

@@ -384,7 +384,7 @@ def test_get_all_ignores_bad_files(self):
         os.chmod(os.path.join(self.info_dir, "pid-9012.info"), 0o000)
         with mock.patch.object(tb_logging.get_logger(), "debug") as fn:
             self.assertEqual(manager.get_all(), [])
-        self.assertEqual(fn.call_count, 2)  # 2 invalid, 1 unreadable (silent)
+        self.assertEqual(fn.call_count, 3)  # 2 invalid, 1 unreadable (silent)
 
 
 if __name__ == "__main__":

tensorbored/program_test.py

@@ -148,22 +148,25 @@ def testSpecifiedHost(self):
             )
             self.assertStartsWith(server.get_url(), "http://127.0.0.1:")
             one_passed = True
-        except program.TensorBoardServerException:
-            # IPv4 is not supported
+        except (program.TensorBoardServerException, OSError, SystemExit):
+            # IPv4 is not supported or failed to bind
             pass
+
         try:
             server = program.WerkzeugServer(
                 self._StubApplication(),
                 self.make_flags(host="::1", port=0, path_prefix=""),
             )
             self.assertStartsWith(server.get_url(), "http://[::1]:")
             one_passed = True
-        except program.TensorBoardServerException:
-            # IPv6 is not supported
+        except (program.TensorBoardServerException, OSError, SystemExit):
+            # IPv6 is not supported or failed to bind
             pass
+
         self.assertTrue(
-            one_passed
-        )  # We expect either IPv4 or IPv6 to be supported
+            one_passed,
+            "Neither IPv4 (127.0.0.1) nor IPv6 (::1) could be bound.",
+        )
 
 
 class SubcommandTest(tb_test.TestCase):