Fix test breakage: dictionary changed size during iteration

Author: shruti-mantri

src/google/appengine/runtime/context/gae_headers.py

@@ -20,24 +20,24 @@
 
 PREFIX = 'HTTP_X_APPENGINE_'
 
-AUTH_DOMAIN = contextvars.ContextVar('AUTH_DOMAIN')
+AUTH_DOMAIN = contextvars.ContextVar('AUTH_DOMAIN', default='gmail.com')
 DEFAULT_VERSION_HOSTNAME = contextvars.ContextVar('DEFAULT_VERSION_HOSTNAME')
 USER_EMAIL = contextvars.ContextVar('USER_EMAIL')
 USER_ID = contextvars.ContextVar('USER_ID')
-USER_IS_ADMIN = contextvars.ContextVar('USER_IS_ADMIN')
+USER_IS_ADMIN = contextvars.ContextVar('USER_IS_ADMIN', default=False)
 USER_NICKNAME = contextvars.ContextVar('USER_NICKNAME')
 DEFAULT_NAMESPACE = contextvars.ContextVar('DEFAULT_NAMESPACE')
 API_TICKET = contextvars.ContextVar('API_TICKET')
-DEV_REQUEST_ID = contextvars.ContextVar('DEV_REQUEST_ID')
-REQUEST_LOG_ID = contextvars.ContextVar('REQUEST_LOG_ID')
+DEV_REQUEST_ID = contextvars.ContextVar('DEV_REQUEST_ID', default=None)
+REQUEST_LOG_ID = contextvars.ContextVar('REQUEST_LOG_ID', default=None)
 
 
 def init_from_wsgi_environ(
     wsgi_env) -> Dict[contextvars.ContextVar, contextvars.Token]:
   """Init contextvars from matching X_APPENGINE_ headers if found."""
 
   reset_tokens: Dict[contextvars.ContextVar, contextvars.Token] = {}
-  for ctxvar in [v for _, v in globals().items()
+  for ctxvar in [v for _, v in globals().copy().items()
                  if isinstance(v, contextvars.ContextVar)]:
     value = wsgi_env.get(PREFIX + ctxvar.name)
     if value is not None:

src/google/appengine/runtime/context/wsgi.py

@@ -19,19 +19,19 @@
 import contextvars
 from typing import Dict
 
-HTTP_HOST = contextvars.ContextVar('HTTP_HOST')
-HTTP_USER_AGENT = contextvars.ContextVar('HTTP_USER_AGENT')
+HTTP_HOST = contextvars.ContextVar('HTTP_HOST', default=None)
+HTTP_USER_AGENT = contextvars.ContextVar('HTTP_USER_AGENT', default=None)
 
 HTTP_X_CLOUD_TRACE_CONTEXT = contextvars.ContextVar(
-    'HTTP_X_CLOUD_TRACE_CONTEXT')
+    'HTTP_X_CLOUD_TRACE_CONTEXT', default=None)
 
 HTTP_X_GOOGLE_DAPPERTRACEINFO = contextvars.ContextVar(
-    'HTTP_X_GOOGLE_DAPPERTRACEINFO')
+    'HTTP_X_GOOGLE_DAPPERTRACEINFO', default=None)
 
 
 PATH_INFO = contextvars.ContextVar('PATH_INFO')
-PATH_TRANSLATED = contextvars.ContextVar('PATH_TRANSLATED')
-QUERY_STRING = contextvars.ContextVar('QUERY_STRING')
+PATH_TRANSLATED = contextvars.ContextVar('PATH_TRANSLATED', default=None)
+QUERY_STRING = contextvars.ContextVar('QUERY_STRING', default=None)
 SERVER_NAME = contextvars.ContextVar('SERVER_NAME')
 SERVER_PORT = contextvars.ContextVar('SERVER_PORT')
 SERVER_PROTOCOL = contextvars.ContextVar('SERVER_PROTOCOL')
@@ -40,7 +40,7 @@
 def init_from_wsgi_environ(
     wsgi_env) -> Dict[contextvars.ContextVar, contextvars.Token]:
   reset_tokens: Dict[contextvars.ContextVar, contextvars.Token] = {}
-  for ctxvar in [v for _, v in globals().items()
+  for ctxvar in [v for _, v in globals().copy().items()
                  if isinstance(v, contextvars.ContextVar)]:
     if ctxvar.name in wsgi_env:
       token = ctxvar.set(wsgi_env[ctxvar.name])