Merge "Allow functional tests to pass with etag_quoter enabled by default"

Zuul · openstack-gerrit · commit ec6a346afbf9 · 2021-09-24T02:35:55.000Z
diff --git a/test/functional/test_swiftclient.py b/test/functional/test_swiftclient.py
@@ -207,7 +207,7 @@ def test_upload_object(self):
         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 @@ def test_upload_object(self):
         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 @@ def test_upload_object(self):
         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 @@ def test_upload_object(self):
         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 @@ def test_upload_object(self):
         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 @@ def test_upload_object(self):
         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 @@ def test_upload_object(self):
         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
