From 333ae3086f263b109d3b8057cac5fa58d5af5eee Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Mon, 3 Dec 2018 19:21:18 +0000
Subject: [PATCH] Fix in-process func tests to work with newer PasteDeploy

Apparently they changed the order of how default, global, and local config
get applied? See also: https://github.com/Pylons/pastedeploy/commit/556611a

Change-Id: Ie7322ef362b0b22898c14db7d0fcd3dafc40d473
---
 test/functional/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/functional/__init__.py b/test/functional/__init__.py
index 23b1f2a917..6435d175c6 100644
--- a/test/functional/__init__.py
+++ b/test/functional/__init__.py
@@ -538,7 +538,6 @@ def in_process_setup(the_object_server=object_server):
         storage_policy.reload_storage_policies()
 
     global config
-    config['__file__'] = 'in_process_setup()'
     if constraints.SWIFT_CONSTRAINTS_LOADED:
         # Use the swift constraints that are loaded for the test framework
         # configuration