Fixed positional test for object test cases and a lint error in the upgrade script

PiperOrigin-RevId: 230198038

Author: tamaranorman

tensorflow/tools/compatibility/tf_upgrade_v2.py

@@ -896,14 +896,10 @@ def __init__(self):
             make_initializable_iterator_deprecation,
         "*.make_one_shot_iterator":
             make_one_shot_iterator_deprecation,
-        "tf.assert_greater":
-            assert_return_type_comment,
         "tf.assert_equal":
             assert_return_type_comment,
         "tf.assert_none_equal":
             assert_return_type_comment,
-        "tf.assert_less":
-            assert_return_type_comment,
         "tf.assert_negative":
             assert_return_type_comment,
         "tf.assert_positive":

tensorflow/tools/compatibility/tf_upgrade_v2_test.py

@@ -296,14 +296,20 @@ def conversion_visitor(unused_path, unused_parent, children):
   def testPositionsMatchArgGiven(self):
     full_dict = tf_upgrade_v2.TFAPIChangeSpec().function_arg_warnings
     method_names = full_dict.keys()
-    for method in method_names:
-      # doesn't test methods on objects
-      if not method.startswith("*."):
-        args = full_dict[method].keys()
-        method = get_symbol_for_name(tf, method)
-        arg_spec = tf_inspect.getfullargspec(method)
-        for (arg, pos) in args:
-          self.assertEqual(arg_spec[0][pos], arg)
+    for method_name in method_names:
+      args = full_dict[method_name].keys()
+      # special case for optimizer methods
+      if method_name.startswith("*."):
+        method = method_name.replace("*", "tf.train.Optimizer")
+      else:
+        method = method_name
+      method = get_symbol_for_name(tf, method)
+      arg_spec = tf_inspect.getfullargspec(method)
+      for (arg, pos) in args:
+        # to deal with the self argument on methods on objects
+        if method_name.startswith("*."):
+          pos += 1
+        self.assertEqual(arg_spec[0][pos], arg)
 
   def testReorderFileNeedsUpdate(self):
     reordered_function_names = (