Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/project/test/redirects_test.py b/project/test/redirects_test.py
index 0091571..1f71435 100644
--- a/project/test/redirects_test.py
+++ b/project/test/redirects_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.
"""Tests for project handlers that redirect."""
from __future__ import print_function
@@ -11,7 +10,7 @@
from six.moves import http_client
import unittest
-import webapp2
+import flask
from framework import urls
from project import redirects
@@ -24,9 +23,8 @@
def setUp(self):
self.services = service_manager.Services()
- self.servlet = redirects.WikiRedirect(
- webapp2.Request.blank('url'), webapp2.Response(),
- services=self.services)
+ self.servlet = redirects.WikiRedirect(services=self.services)
+ self.servlet.response = flask.Response()
self.project = fake.Project()
self.servlet.mr = testing_helpers.MakeMonorailRequest(
project=self.project)
@@ -58,9 +56,8 @@
def setUp(self):
self.services = service_manager.Services()
- self.servlet = redirects.SourceRedirect(
- webapp2.Request.blank('url'), webapp2.Response(),
- services=self.services)
+ self.servlet = redirects.SourceRedirect(services=self.services)
+ self.servlet.response = flask.Response()
self.project = fake.Project()
self.servlet.mr = testing_helpers.MakeMonorailRequest(
project=self.project)