Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/framework/test/profiler_test.py b/framework/test/profiler_test.py
index 3cc7e85..3694e93 100644
--- a/framework/test/profiler_test.py
+++ b/framework/test/profiler_test.py
@@ -1,7 +1,6 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://developers.google.com/open-source/licenses/bsd
+# Copyright 2016 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
"""Test for monorail.framework.profiler."""
from __future__ import print_function
@@ -73,7 +72,7 @@
with prof.Phase('baz'):
raise Exception('whoops')
except Exception as e:
- self.assertEqual(e.message, 'whoops')
+ self.assertEqual(str(e), 'whoops')
finally:
self.assertEqual(prof.current_phase.name, 'overall profile')
self.assertEqual(prof.top_phase.subphases[0].subphases[1].name, 'baz')