From f1e0098f2a702c8cbce80ece16f2c0aa23942fd5 Mon Sep 17 00:00:00 2001
From: Haoyu Zhang <haoyuzhang@google.com>
Date: Wed, 25 Mar 2020 10:44:22 -0700
Subject: [PATCH] Dropping tests for non-EagerService code path in
 remote_cluster_test.

PiperOrigin-RevId: 302922575
Change-Id: I8b335e1f0ff8ed5a3f47b1fbc77302e500d7de37
---
 tensorflow/python/eager/BUILD                 |  2 +-
 .../python/eager/remote_cluster_test.py       | 22 -------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/tensorflow/python/eager/BUILD b/tensorflow/python/eager/BUILD
index 9df6113b95f..ba67f20b209 100644
--- a/tensorflow/python/eager/BUILD
+++ b/tensorflow/python/eager/BUILD
@@ -891,7 +891,7 @@ cuda_py_test(
     srcs = ["remote_cluster_test.py"],
     grpc_enabled = True,
     python_version = "PY3",
-    shard_count = 16,
+    shard_count = 8,
     tags = [
         "no_oss",  # This test launches local server
         "notsan",  # TODO(b/152075365)
diff --git a/tensorflow/python/eager/remote_cluster_test.py b/tensorflow/python/eager/remote_cluster_test.py
index 78e7098d081..11310c0b5c4 100644
--- a/tensorflow/python/eager/remote_cluster_test.py
+++ b/tensorflow/python/eager/remote_cluster_test.py
@@ -495,28 +495,6 @@ class DynamicClusterTest(test.TestCase, parameterized.TestCase):
       context.check_alive("/job:remote_device/replica:0/task:10")
 
 
-class DynamicClusterWithoutLazyRemoteInputsCopyTest(DynamicClusterTest):
-
-  @classmethod
-  def setUpClass(cls):
-    super(DynamicClusterWithoutLazyRemoteInputsCopyTest, cls).setUpClass()
-    context._reset_context()
-    context.context().lazy_remote_inputs_copy = False
-
-  @classmethod
-  def tearDownClass(cls):
-    super(DynamicClusterWithoutLazyRemoteInputsCopyTest, cls).tearDownClass()
-    context._reset_context()
-    context.context().lazy_remote_inputs_copy = True
-
-  # TODO(haoyuzhang): When lazyh remote inputs copy is disabled, we use the
-  # WorkerService RunGraph request to execute component functions in distributed
-  # function execution. We currently do not have access control in WorkerService
-  # to allow concurrent cluster update and function execution.
-  def testMultiThreadPendingNodesLockFree(self):
-    self.skipTest("Unsupported case")
-
-
 if __name__ == "__main__":
   ops.enable_eager_execution()
   test.main()