[Merge] lp:~morphis/aethercast/fix-integraion-tests into lp:aethercast

[Simon Fels]

Simon Fels has proposed merging lp:~morphis/aethercast/fix-integraion-tests into lp:aethercast.

Commit message:
Fix integration tests

There were several problems with the integration tests so that they couldn't run at all. This fixes the different problems:

* don't acquire display lock twice
* allow user to specify a different reference result file per environment variable
* run glib mainloop for a second on startup to respect deferred pipeline startup

Requested reviews:
  Ubuntu Phablet Team (phablet-team)

For more details, see:
https://code.launchpad.net/~morphis/aethercast/fix-integraion-tests/+merge/298400
-- 
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~morphis/aethercast/fix-integraion-tests into lp:aethercast.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 1885 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20160627/5eaec220/attachment.diff>