Skip to content

Commit 5b01509

Browse files
cleanup of deprecated test methods
PiperOrigin-RevId: 716157714
1 parent c48df83 commit 5b01509

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

tensorflow_examples/lite/model_maker/core/data_util/audio_dataloader_test.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,13 +150,13 @@ def test_from_esc50(self):
150150
self.assertEqual(expected_results[filename], label)
151151

152152
# fitlered dataset
153-
with self.assertRaisesRegexp(ValueError, 'No audio files found'):
153+
with self.assertRaisesRegex(ValueError, 'No audio files found'):
154154
loader = audio_dataloader.DataLoader.from_esc50(
155155
spec, folder_path, folds=[
156156
3,
157157
])
158158

159-
with self.assertRaisesRegexp(ValueError, 'No audio files found'):
159+
with self.assertRaisesRegex(ValueError, 'No audio files found'):
160160
loader = audio_dataloader.DataLoader.from_esc50(
161161
spec, folder_path, categories=['unknown'])
162162

@@ -230,7 +230,7 @@ def test_spec(self):
230230
def test_no_audio_files_found(self):
231231
folder_path = self._get_folder_path('test_no_audio_files_found')
232232
write_sample(folder_path, 'unknown', '2s.bak', 44100, 2, value=1)
233-
with self.assertRaisesRegexp(ValueError, 'No audio files found'):
233+
with self.assertRaisesRegex(ValueError, 'No audio files found'):
234234
spec = MockSpec(model_dir=folder_path)
235235
audio_dataloader.DataLoader.from_folder(spec, folder_path)
236236

@@ -259,8 +259,9 @@ def test_failed_librosa_imoprt(self):
259259
spec = MockSpec(model_dir=folder_path)
260260
loader = audio_dataloader.DataLoader.from_folder(spec, folder_path)
261261
self.assertEqual(len(loader), 2)
262-
with self.assertRaisesRegexp(tf.errors.UnknownError,
263-
'sudo apt-get install libsndfile1'):
262+
with self.assertRaisesRegex(
263+
tf.errors.UnknownError, 'sudo apt-get install libsndfile1'
264+
):
264265
_ = list(loader.gen_dataset())
265266

266267
finally:

tensorflow_examples/lite/model_maker/core/task/model_spec/audio_spec_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def testEnsureVersion(self):
7777

7878
for valid_version in invalid_versions:
7979
audio_spec._get_tf_version = lambda: valid_version # pylint: disable=cell-var-from-loop
80-
with self.assertRaisesRegexp(RuntimeError, '2.5.0'):
80+
with self.assertRaisesRegex(RuntimeError, '2.5.0'):
8181
spec()
8282

8383
audio_spec._get_tf_version = tmp_version_fn

0 commit comments

Comments
 (0)