From f2f688b89b9c2c497f271f3f75f8e7b3272e29cb Mon Sep 17 00:00:00 2001
From: xjm <xjm@65776.no-reply.drupal.org>
Date: Wed, 8 Feb 2017 10:32:45 -0600
Subject: [PATCH] Issue #2849222 by tstoeckler: settings.testing.php /
 testing.services.yml not picked up by BrowserTestBase

---
 core/tests/Drupal/Tests/BrowserTestBase.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/core/tests/Drupal/Tests/BrowserTestBase.php b/core/tests/Drupal/Tests/BrowserTestBase.php
index 575d8c5e812..aa72a494d03 100644
--- a/core/tests/Drupal/Tests/BrowserTestBase.php
+++ b/core/tests/Drupal/Tests/BrowserTestBase.php
@@ -73,13 +73,6 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
    */
   protected $databasePrefix;
 
-  /**
-   * The site directory of the original parent site.
-   *
-   * @var string
-   */
-  protected $originalSiteDirectory;
-
   /**
    * Time limit in seconds for the test.
    *
@@ -1027,7 +1020,7 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
     $kernel->prepareLegacyRequest($request);
     $this->prepareDatabasePrefix();
 
-    $this->originalSiteDirectory = $kernel->findSitePath($request);
+    $this->originalSite = $kernel->findSitePath($request);
 
     // Create test directory ahead of installation so fatal errors and debug
     // information can be logged during installation process.