Browse Source

Update swift client in Zaqar

Change-Id: I5af660388509f716adbe9e2ed9246b8dccdc6fd5
changes/94/791094/5
wanghao 9 months ago
parent
commit
db6a6b4908
  1. 6
      lower-constraints.txt
  2. 6
      requirements.txt
  3. 2
      test-requirements.txt
  4. 4
      zaqar/tests/unit/transport/wsgi/v1/test_home.py
  5. 4
      zaqar/tests/unit/transport/wsgi/v1_1/test_home.py
  6. 4
      zaqar/tests/unit/transport/wsgi/v2_0/test_home.py
  7. 4
      zaqar/transport/wsgi/errors.py

6
lower-constraints.txt

@ -8,14 +8,14 @@ doc8==0.8.1
docutils==0.15.2
dogpile.cache==1.0.2
enum34==1.0.4;python_version=='2.7'
falcon==1.1.0
falcon==3.0.0
fixtures==3.0.0
future==0.16.0
futurist==1.2.0
iso8601==0.1.11
jsonschema==3.2.0
keystoneauth1==3.4.0
keystonemiddleware==4.17.0
keystonemiddleware==9.1.0
msgpack==1.0.0
os-api-ref==1.4.0
os-client-config==1.28.0
@ -42,7 +42,7 @@ PyMySQL==0.8.0
python-keystoneclient==3.8.0
python-memcached==1.56
python-subunit==1.0.0
python-swiftclient==3.2.0
python-swiftclient==3.10.1
pytz==2013.6
PyYAML==5.1
redis==3.0.0

6
requirements.txt

@ -6,13 +6,13 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0
alembic>=0.9.6 # MIT
Babel!=2.4.0,>=2.3.4 # BSD
cryptography>=2.7 # BSD/Apache-2.0
falcon>=1.1.0 # Apache-2.0
falcon>=3.0.0 # Apache-2.0
jsonschema>=3.2.0 # MIT
iso8601>=0.1.11 # MIT
keystonemiddleware>=4.17.0 # Apache-2.0
keystonemiddleware>=9.1.0 # Apache-2.0
msgpack>=1.0.0 # Apache-2.0
python-memcached>=1.56 # PSF
python-swiftclient>=3.2.0 # Apache-2.0
python-swiftclient>=3.10.1 # Apache-2.0
WebOb>=1.7.1 # MIT
stevedore>=1.20.0 # Apache-2.0
oslo.cache>=1.26.0 # Apache-2.0

2
test-requirements.txt

@ -7,7 +7,7 @@ hacking>=3.0.1,<3.1.0 # Apache-2.0
# Backends
redis>=3.0.0 # MIT
pymongo>=3.6.0 # Apache-2.0
python-swiftclient>=3.2.0 # Apache-2.0
python-swiftclient>=3.10.1 # Apache-2.0
websocket-client>=0.44.0 # LGPLv2+
PyMySQL>=0.8.0 # MIT License

4
zaqar/tests/unit/transport/wsgi/v1/test_home.py

@ -24,7 +24,7 @@ class TestHomeDocument(base.V1Base):
config_file = 'wsgi_mongodb.conf'
def test_json_response(self):
body = self.simulate_get(self.url_prefix)
body = self.simulate_get(self.url_prefix + '/')
self.assertEqual(falcon.HTTP_200, self.srmock.status)
content_type = self.srmock.headers_dict['Content-Type']
@ -36,7 +36,7 @@ class TestHomeDocument(base.V1Base):
self.fail('Home document is not valid JSON')
def test_href_template(self):
body = self.simulate_get(self.url_prefix)
body = self.simulate_get(self.url_prefix + '/')
self.assertEqual(falcon.HTTP_200, self.srmock.status)
resp = jsonutils.loads(body[0])
queue_href_template = resp['resources']['rel/queue']['href-template']

4
zaqar/tests/unit/transport/wsgi/v1_1/test_home.py

@ -30,7 +30,7 @@ class TestHomeDocument(base.V1_1Base):
'Client-ID': uuidutils.generate_uuid(),
'X-Project-ID': '8383830383abc_'
}
body = self.simulate_get(self.url_prefix, headers=self.headers)
body = self.simulate_get(self.url_prefix + '/', headers=self.headers)
self.assertEqual(falcon.HTTP_200, self.srmock.status)
content_type = self.srmock.headers_dict['Content-Type']
@ -46,7 +46,7 @@ class TestHomeDocument(base.V1_1Base):
'Client-ID': uuidutils.generate_uuid(),
'X-Project-ID': '8383830383'
}
body = self.simulate_get(self.url_prefix, headers=self.headers)
body = self.simulate_get(self.url_prefix + '/', headers=self.headers)
self.assertEqual(falcon.HTTP_200, self.srmock.status)
resp = jsonutils.loads(body[0])
queue_href_template = resp['resources']['rel/queue']['href-template']

4
zaqar/tests/unit/transport/wsgi/v2_0/test_home.py

@ -30,7 +30,7 @@ class TestHomeDocument(base.V2Base):
'Client-ID': uuidutils.generate_uuid(),
'X-Project-ID': '8383830383abc_'
}
body = self.simulate_get(self.url_prefix, headers=self.headers)
body = self.simulate_get(self.url_prefix + '/', headers=self.headers)
self.assertEqual(falcon.HTTP_200, self.srmock.status)
content_type = self.srmock.headers_dict['Content-Type']
@ -46,7 +46,7 @@ class TestHomeDocument(base.V2Base):
'Client-ID': uuidutils.generate_uuid(),
'X-Project-ID': '8383830383'
}
body = self.simulate_get(self.url_prefix, headers=self.headers)
body = self.simulate_get(self.url_prefix + '/', headers=self.headers)
self.assertEqual(falcon.HTTP_200, self.srmock.status)
resp = jsonutils.loads(body[0])
queue_href_template = resp['resources']['rel/queue']['href-template']

4
zaqar/transport/wsgi/errors.py

@ -24,10 +24,10 @@ class HTTPServiceUnavailable(falcon.HTTPServiceUnavailable):
TITLE = _(u'Service temporarily unavailable')
DESCRIPTION = _(u'Please try again in a few seconds.')
def __init__(self, description, retry_after=30):
def __init__(self, description):
description = description + ' ' + self.DESCRIPTION
super(HTTPServiceUnavailable, self).__init__(
self.TITLE, description, retry_after)
self.TITLE, description)
class HTTPBadRequestAPI(falcon.HTTPBadRequest):

Loading…
Cancel
Save