Merge lp:~smspillaz/compiz/compiz.fix-tests into lp:compiz/0.9.12

[Sam Spilsbury]

Fix broken tests

Can someone look into why we're not getting automated CI runs anymore?

Apparently the tests have been broken for months now and nobody noticed. That's really bad.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4000
http://jenkins.qa.ubuntu.com/job/compiz-ci/115/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-xenial-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-xenial-armhf-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-xenial-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/115/rebuild

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Oh, CI runs here, but maybe not for every test case...

That's weird, anyway thanks a lot for catching it and for your fix!

review: Approve

=== modified file 'compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.c'
--- compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.c	2014-04-07 22:37:35 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/ccs_gsettings_backend.c	2016-03-03 14:26:17 +0000
@@ -183,8 +183,6 @@
     const char *ccsProfile = ccsGetProfile (context);
     char *profile = NULL;
 
-    CCSGSettingsBackendPrivate *priv = (CCSGSettingsBackendPrivate *) ccsObjectGetPrivate (backend);
-
     if (!ccsProfile)
 	profile = strdup (DEFAULTPROF);
     else
@@ -197,11 +195,7 @@
     }
 
     if (g_strcmp0 (profile, currentProfile))
-    {
 	ccsGSettingsBackendUpdateCurrentProfileName (backend, profile);
-	g_list_free_full (priv->settingsList, ccsGSettingsWrapperDestroyNotify);
-	priv->settingsList = NULL;
-    }
 
     free (profile);
 
@@ -294,6 +288,9 @@
     if (priv->currentProfileSettings)
 	ccsGSettingsWrapperUnref (priv->currentProfileSettings);
 
+    g_list_free_full (priv->settingsList, ccsGSettingsWrapperDestroyNotify);
+    priv->settingsList = NULL;
+
     priv->currentProfile = strdup (value);
     priv->currentProfileSettings = ccsGSettingsWrapperNewForSchemaWithPath (PROFILE_SCHEMA_ID,
 									    profilePath,

=== modified file 'plugins/resize/src/logic/src/resize-logic.cpp'
--- plugins/resize/src/logic/src/resize-logic.cpp	2015-10-20 15:01:58 +0000
+++ plugins/resize/src/logic/src/resize-logic.cpp	2016-03-03 14:26:17 +0000
@@ -439,7 +439,7 @@
 		    lastMaskY = mask;
 		}
 
-		mScreen->updateGrab (grabIndex, screen->cursorCache (keyCursorNames[i]));
+		mScreen->updateGrab (grabIndex, mScreen->cursorCache (keyCursorNames[i]));
 	    }
 	    break;
 	}
@@ -692,7 +692,7 @@
 	cursor_name = DOWN_CURSOR;
     }
 
-    return screen->cursorCache (cursor_name);
+    return mScreen->cursorCache (cursor_name);
 }
 
 void
@@ -1338,7 +1338,7 @@
 	    Cursor cursor;
 
 	    if (state & CompAction::StateInitKey)
-		cursor = screen->cursorCache (MIDDLE_CURSOR);
+		cursor = mScreen->cursorCache (MIDDLE_CURSOR);
 	    else
 		cursor = cursorFromResizeMask (mask);
 

=== modified file 'plugins/resize/src/logic/tests/test-logic.cpp'
--- plugins/resize/src/logic/tests/test-logic.cpp	2014-03-12 19:05:44 +0000
+++ plugins/resize/src/logic/tests/test-logic.cpp	2016-03-03 14:26:17 +0000
@@ -172,6 +172,9 @@
 
 	EXPECT_CALL (mockScreen, glPaintOutputSetEnabled (_))
 	    .Times(AnyNumber());
+
+        EXPECT_CALL (mockScreen, cursorCache(_))
+            .WillRepeatedly (Return (0));
     }
 
     void SetUpFakePropertyWriter ()