Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/framework/test/warmup_test.py b/framework/test/warmup_test.py
index 13223f1..b3eab65 100644
--- a/framework/test/warmup_test.py
+++ b/framework/test/warmup_test.py
@@ -1,7 +1,6 @@
-# Copyright 2017 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 2017 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
"""Tests for the warmup servlet."""
from __future__ import print_function
@@ -25,7 +24,7 @@
response = client.get('/')
self.assertEqual(response.status_code, 200)
- self.assertEqual(response.data, '')
+ self.assertEqual(response.data, b'')
def testHandleStart(self):
app = flask.Flask(__name__)
@@ -35,7 +34,7 @@
response = client.get('/')
self.assertEqual(response.status_code, 200)
- self.assertEqual(response.data, '')
+ self.assertEqual(response.data, b'')
def testHandleStop(self):
app = flask.Flask(__name__)
@@ -45,4 +44,4 @@
response = client.get('/')
self.assertEqual(response.status_code, 200)
- self.assertEqual(response.data, '')
+ self.assertEqual(response.data, b'')