Merge pull request tensorflow#9207 from av8ramit/cherrypicks

Amit Patankar · web-flow · commit d4af1125b411 · 2017-04-13T19:47:31.000-07:00
Cherrypick
diff --git a/tensorflow/python/ops/gradients_test.py b/tensorflow/python/ops/gradients_test.py
@@ -562,14 +562,16 @@ def testInt64Indices(self):
   def testWarnings(self):
     # TODO(gunan) Reenable after this issue is fixed:
     # https://github.com/google/protobuf/issues/2812
-    if sys.version_info < (3, 6):
-      # Smaller than the threshold: no warning.
-      c_sparse = ops.IndexedSlices(
-          array_ops.placeholder(dtypes.float32),
-          array_ops.placeholder(dtypes.int32), constant([4, 4, 4, 4]))
-      with warnings.catch_warnings(record=True) as w:
-        math_ops.multiply(c_sparse, 1.0)
-      self.assertEqual(0, len(w))
+    if sys.version_info >= (3, 6):
+      self.skipTest("Skipped test for Python 3.6+")
+
+    # Smaller than the threshold: no warning.
+    c_sparse = ops.IndexedSlices(
+        array_ops.placeholder(dtypes.float32),
+        array_ops.placeholder(dtypes.int32), constant([4, 4, 4, 4]))
+    with warnings.catch_warnings(record=True) as w:
+      math_ops.multiply(c_sparse, 1.0)
+    self.assertEqual(0, len(w))
 
     # Greater than or equal to the threshold: warning.
     c_sparse = ops.IndexedSlices(
