Merge lp:~compiz-team/compiz/compiz.fix_1169170 into lp:compiz/0.9.10

[Sam Spilsbury]

Don't timeout after 3000ms when asking compiz for a startup message.

It can sometimes take longer in the valgrind case. Also timeouts are
bad design for tests.

(LP: #1169170)

Don't timeout after 3000ms when asking compiz for a startup message.

It can sometimes take longer in the valgrind case. Also timeouts are
bad design for tests.

(LP: #1169170)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3657
http://jenkins.qa.ubuntu.com/job/compiz-ci/132/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/169
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-pbuilder/./build=pbuilder,distribution=raring,flavor=amd64/521

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

review: Approve (continuous-integration)

[MC Return (mc-return)]

LGTM.

review: Approve

=== modified file 'tests/xorg-gtest/src/compiz-xorg-gtest.cpp'
--- tests/xorg-gtest/src/compiz-xorg-gtest.cpp	2013-03-29 18:41:26 +0000
+++ tests/xorg-gtest/src/compiz-xorg-gtest.cpp	2013-04-16 00:58:33 +0000
@@ -678,7 +678,7 @@
 ct::CompizXorgSystemTest::StartCompiz (ct::CompizProcess::StartupFlags     flags,
 				       const ct::CompizProcess::PluginList &plugins)
 {
-    priv->mProcess.reset (new ct::CompizProcess (Display (), flags, plugins, 3000));
+    priv->mProcess.reset (new ct::CompizProcess (Display (), flags, plugins));
 }
 
 class ct::PrivateAutostartCompizXorgSystemTest