Skip to content

Commit e9248e8

Browse files
cleanup of deprecated test methods
PiperOrigin-RevId: 716240546
1 parent 384111f commit e9248e8

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

tf_keras/engine/input_layer_test.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -267,31 +267,31 @@ def run_model(inp):
267267

268268
@test_combinations.generate(test_combinations.combine(mode=["eager"]))
269269
def testNoMixingArgsWithTypeSpecArg(self):
270-
with self.assertRaisesRegexp(
270+
with self.assertRaisesRegex(
271271
ValueError, "all other args except `name` must be None"
272272
):
273273
input_layer_lib.Input(
274274
shape=(4, 7), type_spec=tf.TensorSpec((2, 7, 32), tf.float32)
275275
)
276-
with self.assertRaisesRegexp(
276+
with self.assertRaisesRegex(
277277
ValueError, "all other args except `name` must be None"
278278
):
279279
input_layer_lib.Input(
280280
batch_size=4, type_spec=tf.TensorSpec((7, 32), tf.float32)
281281
)
282-
with self.assertRaisesRegexp(
282+
with self.assertRaisesRegex(
283283
ValueError, "all other args except `name` must be None"
284284
):
285285
input_layer_lib.Input(
286286
dtype=tf.int64, type_spec=tf.TensorSpec((7, 32), tf.float32)
287287
)
288-
with self.assertRaisesRegexp(
288+
with self.assertRaisesRegex(
289289
ValueError, "all other args except `name` must be None"
290290
):
291291
input_layer_lib.Input(
292292
sparse=True, type_spec=tf.TensorSpec((7, 32), tf.float32)
293293
)
294-
with self.assertRaisesRegexp(
294+
with self.assertRaisesRegex(
295295
ValueError, "all other args except `name` must be None"
296296
):
297297
input_layer_lib.Input(

tf_keras/layers/normalization/batch_normalization_dtensor_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ def value_fn(value_context):
120120
)
121121
if training and not synchronized and renorm:
122122
# This is an unsupported case at the moment.
123-
with self.assertRaisesRegexp(NotImplementedError, "not supported"):
123+
with self.assertRaisesRegex(NotImplementedError, "not supported"):
124124
self._run_bn_training_with_strategy(
125125
dtensor_strategy, value_fn, bn_layer_1, run_kwargs
126126
)

tf_keras/saving/legacy/saved_model/json_utils_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def test_encode_decode_type_spec(self):
7070
"serialized": None,
7171
}
7272
string = json_utils.Encoder().encode(invalid_type_spec)
73-
with self.assertRaisesRegexp(
73+
with self.assertRaisesRegex(
7474
ValueError, "No TypeSpec has been registered"
7575
):
7676
loaded = json_utils.decode(string)

tf_keras/utils/data_utils_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def test_get_file_and_validate_it(self):
134134
)
135135
os.remove(path)
136136

137-
with self.assertRaisesRegexp(
137+
with self.assertRaisesRegex(
138138
ValueError, 'Please specify the "origin".*'
139139
):
140140
_ = keras.utils.data_utils.get_file()

tf_keras/utils/dataset_utils_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ def test_invalid_float_left_and_right_sizes(self):
457457
r"^(.*?(\bleft_size\b).*?(\bshould be\b)"
458458
r".*?(\bwithin the range\b).*?(\b0\b).*?(\b1\b))"
459459
)
460-
with self.assertRaisesRegexp(ValueError, expected_regex):
460+
with self.assertRaisesRegex(ValueError, expected_regex):
461461
dataset = [
462462
np.ones(shape=(200, 32, 32)),
463463
np.zeros(shape=(200, 32, 32)),

0 commit comments

Comments
 (0)