From 16f649322f2c575f7900549b1be9b18f7986abc6 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Tue, 7 Feb 2017 09:11:37 -0700
Subject: [PATCH] Add some sanity checks on egw session / GLOBALS before we
 start testing, makes it easier to figure out where things went wrong.

---
 api/src/test/LoggedInTest.php | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/api/src/test/LoggedInTest.php b/api/src/test/LoggedInTest.php
index a7870dc81f..ce7e922fc6 100644
--- a/api/src/test/LoggedInTest.php
+++ b/api/src/test/LoggedInTest.php
@@ -17,6 +17,7 @@ namespace EGroupware\Api;
 require_once realpath(__DIR__.'/../loader/common.php');	// autoloader & check_load_extension
 
 use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit_Framework_ExpectationFailedException as PHPUnitException;
 use EGroupware\Api;
 
 /**
@@ -60,7 +61,13 @@ abstract class LoggedInTest extends TestCase
 		catch(Exception $e)
 		{
 			static::markTestSkipped('Unable to connect to Egroupware');
-			die();
+			throw $e;
+		}
+
+		// Do some checks to make sure things we expect are there
+		if(!static::sanity_check())
+		{
+			throw new PHPUnitException('Unable to connect to Egroupware - failed sanity check');
 		}
 	}
 
@@ -146,6 +153,9 @@ abstract class LoggedInTest extends TestCase
 
 			$GLOBALS['egw'] = new Api\Egw(array_keys($GLOBALS['egw_domain']));
 		}
+		
+		// Disable asyc while we test
+		$GLOBALS['egw_info']['server']['asyncservice'] = 'off';
 	}
 
 
@@ -164,4 +174,24 @@ abstract class LoggedInTest extends TestCase
 		unset($GLOBALS['egw_login_data']);
 		return $sessionid;
 	}
+
+	/**
+	 * Do some checks to make sure things we expect are there
+	 */
+	protected static function sanity_check()
+	{
+		// Check that the apps are loaded
+		if(!array_key_exists('apps', $GLOBALS['egw_info']) || count($GLOBALS['egw_info']['apps']) == 0)
+		{
+			return false;
+		}
+
+		// Check that the user is loaded
+		if(!array_key_exists('user', $GLOBALS['egw_info']) || !$GLOBALS['egw_info']['user']['account_id'])
+		{
+			return false;
+		}
+
+		return true;
+	}
 }
\ No newline at end of file