summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-09-24 02:35:55 +0000
committerGerrit Code Review <review@openstack.org>2021-09-24 02:35:55 +0000
commitec6a346afbf93374b132c93f6d114d58999998de (patch)
treefc739e5698a80dcf9da3a39bc635137409bda62e
parente03a11c6497d749ee6bd1fdc164621d930ae0eac (diff)
parent6d8138ebcf3cc7cc3c50cf8c06b58d5369d5c395 (diff)
downloadpython-swiftclient-ec6a346afbf93374b132c93f6d114d58999998de.tar.gz
Merge "Allow functional tests to pass with etag_quoter enabled by default"
-rw-r--r--test/functional/test_swiftclient.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/test/functional/test_swiftclient.py b/test/functional/test_swiftclient.py
index aaade87..8d001d0 100644
--- a/test/functional/test_swiftclient.py
+++ b/test/functional/test_swiftclient.py
@@ -207,7 +207,7 @@ class TestFunctional(unittest.TestCase):
hdrs = self.conn.head_object(self.containername, self.objectname)
self.assertEqual(str(len(self.test_data)),
hdrs.get('content-length'))
- self.assertEqual(self.etag, hdrs.get('etag'))
+ self.assertEqual(self.etag, hdrs.get('etag').strip('"'))
self.assertEqual('application/octet-stream',
hdrs.get('content-type'))
@@ -218,7 +218,7 @@ class TestFunctional(unittest.TestCase):
hdrs = self.conn.head_object(self.containername, self.objectname)
self.assertEqual(str(len(self.test_data)),
hdrs.get('content-length'))
- self.assertEqual(self.etag, hdrs.get('etag'))
+ self.assertEqual(self.etag, hdrs.get('etag').strip('"'))
self.assertEqual('text/plain',
hdrs.get('content-type'))
@@ -229,7 +229,7 @@ class TestFunctional(unittest.TestCase):
hdrs = self.conn.head_object(self.containername, self.objectname)
self.assertEqual(str(len(self.test_data)),
hdrs.get('content-length'))
- self.assertEqual(self.etag, hdrs.get('etag'))
+ self.assertEqual(self.etag, hdrs.get('etag').strip('"'))
self.assertEqual('text/plain',
hdrs.get('content-type'))
@@ -241,7 +241,7 @@ class TestFunctional(unittest.TestCase):
hdrs = self.conn.head_object(self.containername, self.objectname)
self.assertEqual(str(len(self.test_data)),
hdrs.get('content-length'))
- self.assertEqual(self.etag, hdrs.get('etag'))
+ self.assertEqual(self.etag, hdrs.get('etag').strip('"'))
self.assertEqual('image/jpeg',
hdrs.get('content-type'))
@@ -252,7 +252,7 @@ class TestFunctional(unittest.TestCase):
hdrs = self.conn.head_object(self.containername, self.objectname)
self.assertEqual(str(len(self.test_data)),
hdrs.get('content-length'))
- self.assertEqual(self.etag, hdrs.get('etag'))
+ self.assertEqual(self.etag, hdrs.get('etag').strip('"'))
self.assertEqual('application/octet-stream', hdrs.get('content-type'))
# Content from File-like object
@@ -262,7 +262,7 @@ class TestFunctional(unittest.TestCase):
hdrs = self.conn.head_object(self.containername, self.objectname)
self.assertEqual(str(len(self.test_data)),
hdrs.get('content-length'))
- self.assertEqual(self.etag, hdrs.get('etag'))
+ self.assertEqual(self.etag, hdrs.get('etag').strip('"'))
self.assertEqual('application/octet-stream', hdrs.get('content-type'))
# Content from File-like object, but read in chunks
@@ -274,7 +274,7 @@ class TestFunctional(unittest.TestCase):
hdrs = self.conn.head_object(self.containername, self.objectname)
self.assertEqual(str(len(self.test_data)),
hdrs.get('content-length'))
- self.assertEqual(self.etag, hdrs.get('etag'))
+ self.assertEqual(self.etag, hdrs.get('etag').strip('"'))
self.assertEqual('application/octet-stream', hdrs.get('content-type'))
# Wrong etag arg, should raise an exception