From 6d8138ebcf3cc7cc3c50cf8c06b58d5369d5c395 Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Tue, 11 May 2021 13:42:47 -0700
Subject: [PATCH] Allow functional tests to pass with etag_quoter enabled by
 default

Change-Id: I861b5e0a172f0ea0a5b1fe8389cd70da8d4b5d5d
---
 test/functional/test_swiftclient.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/functional/test_swiftclient.py b/test/functional/test_swiftclient.py
index aaade879..8d001d0f 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