From 3b4002877a4d40c7081e4c3f2b509d359e3f5842 Mon Sep 17 00:00:00 2001
From: Joseph Schorr <joseph.schorr@coreos.com>
Date: Wed, 14 Nov 2018 08:51:01 +0200
Subject: [PATCH] Fix mimetype handling in registry tests

---
 test/registry/protocol_v2.py | 4 ++--
 test/registry/protocols.py   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/registry/protocol_v2.py b/test/registry/protocol_v2.py
index 9fab40059..f8377e929 100644
--- a/test/registry/protocol_v2.py
+++ b/test/registry/protocol_v2.py
@@ -181,7 +181,7 @@ class V2Protocol(RegistryProtocol):
 
     headers = {
       'Authorization': 'Bearer ' + token,
-      'Accept': ','.join(options.accept_mimetypes or []),
+      'Accept': ','.join(options.accept_mimetypes) if options.accept_mimetypes else '*/*',
     }
 
     # Push all blobs.
@@ -285,7 +285,7 @@ class V2Protocol(RegistryProtocol):
 
     headers = {
       'Authorization': 'Bearer ' + token,
-      'Accept': ','.join(options.accept_mimetypes or []),
+      'Accept': ','.join(options.accept_mimetypes) if options.accept_mimetypes else '*/*',
     }
 
     # Build fake manifests.
diff --git a/test/registry/protocols.py b/test/registry/protocols.py
index 72422dd6a..f179ddd2b 100644
--- a/test/registry/protocols.py
+++ b/test/registry/protocols.py
@@ -68,7 +68,7 @@ class ProtocolOptions(object):
     self.chunks_for_upload = None
     self.skip_head_checks = False
     self.manifest_content_type = None
-    self.accept_mimetypes = '*/*'
+    self.accept_mimetypes = None
     self.mount_blobs = None
     self.push_by_manifest_digest = False