diff options
| author | William Wolf <throughnothing@gmail.com> | 2011-06-22 10:47:51 -0400 |
|---|---|---|
| committer | William Wolf <throughnothing@gmail.com> | 2011-06-22 10:47:51 -0400 |
| commit | 918bbfc61da3541729be44bbfb244f3e0a0c9e13 (patch) | |
| tree | de2a103cf398d7a255341fe6be7a4c1299c55daa | |
| parent | c7704f1ba57e1ce130875469b4a0ad585e9c296b (diff) | |
| parent | 7cb4d3150bf0883944624d46bc458cfd25fa1c9a (diff) | |
merge from trunk
| -rw-r--r-- | nova/tests/api/openstack/test_limits.py | 3 | ||||
| -rw-r--r-- | nova/tests/api/openstack/test_servers.py | 2 | ||||
| -rw-r--r-- | nova/tests/api/openstack/test_wsgi.py | 4 | ||||
| -rw-r--r-- | tools/pip-requires | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/nova/tests/api/openstack/test_limits.py b/nova/tests/api/openstack/test_limits.py index 01613d1d8..38c959fae 100644 --- a/nova/tests/api/openstack/test_limits.py +++ b/nova/tests/api/openstack/test_limits.py @@ -672,8 +672,7 @@ class WsgiLimiterTest(BaseLimitTestSuite): """Only POSTs should work.""" requests = [] for method in ["GET", "PUT", "DELETE", "HEAD", "OPTIONS"]: - request = webob.Request.blank("/") - request.body = self._request_data("GET", "/something") + request = webob.Request.blank("/", method=method) response = request.get_response(self.app) self.assertEqual(response.status_int, 405) diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py index 05de6e2a9..b53c6c9be 100644 --- a/nova/tests/api/openstack/test_servers.py +++ b/nova/tests/api/openstack/test_servers.py @@ -1502,7 +1502,7 @@ class ServersTest(test.TestCase): self.assertEqual(res.status_int, 400) def test_resized_server_has_correct_status(self): - req = self.webreq('/1', 'GET', dict(resize=dict(flavorId=3))) + req = self.webreq('/1', 'GET') def fake_migration_get(*args): return {} diff --git a/nova/tests/api/openstack/test_wsgi.py b/nova/tests/api/openstack/test_wsgi.py index 2fa50ac9b..73a26a087 100644 --- a/nova/tests/api/openstack/test_wsgi.py +++ b/nova/tests/api/openstack/test_wsgi.py @@ -10,13 +10,13 @@ from nova.api.openstack import wsgi class RequestTest(test.TestCase): def test_content_type_missing(self): - request = wsgi.Request.blank('/tests/123') + request = wsgi.Request.blank('/tests/123', method='POST') request.body = "<body />" self.assertRaises(exception.InvalidContentType, request.get_content_type) def test_content_type_unsupported(self): - request = wsgi.Request.blank('/tests/123') + request = wsgi.Request.blank('/tests/123', method='POST') request.headers["Content-Type"] = "text/html" request.body = "asdf<br />" self.assertRaises(exception.InvalidContentType, diff --git a/tools/pip-requires b/tools/pip-requires index 7849dbea9..0da473109 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -15,7 +15,7 @@ python-daemon==1.5.5 python-gflags==1.3 redis==2.0.0 routes==1.12.3 -WebOb==0.9.8 +WebOb==1.0.8 wsgiref==0.1.2 mox==0.5.3 greenlet==0.3.1 |