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

[Simon Fels]

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

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

152. By Simon Fels on 2016-06-27

tests: integration: finish started comment

[Konrad Zapałowicz (kzapalowicz)]

LGTM except on the missing comment line.

review: Needs Fixing (code)

[Konrad Zapałowicz (kzapalowicz)]

LGTM

review: Approve (code)

[Matteo Croce (teknoraver)]

review: Approve

=== modified file 'tests/ac/integration_tests/test_stream_performance.cpp'
--- tests/ac/integration_tests/test_stream_performance.cpp	2016-05-31 13:43:18 +0000
+++ tests/ac/integration_tests/test_stream_performance.cpp	2016-06-27 08:59:28 +0000
@@ -32,6 +32,8 @@
 #include <boost/accumulators/statistics/stats.hpp>
 #include <boost/accumulators/statistics/variance.hpp>
 
+#include <boost/filesystem.hpp>
+
 #include "ac/mediamanagerfactory.h"
 #include "ac/networkutils.h"
 #include "ac/utils.h"
@@ -41,10 +43,12 @@
 
 #include "tests/common/benchmark.h"
 #include "tests/common/statistics.h"
+#include "tests/common/glibhelpers.h"
 
 #include "tests/ac/integration_tests/config.h"
 
 namespace ba = boost::accumulators;
+namespace fs = boost::filesystem;
 
 using namespace ::testing;
 
@@ -157,11 +161,14 @@
         media_manager->InitOptimalVideoFormat(sink_native_format, sink_codecs);
         media_manager->Play();
 
+        // Need to run glib mainloop for a bit to respect deferred pipeline startup
+        ac::testing::RunMainLoop(std::chrono::seconds{1});
+
         std::this_thread::sleep_for(config.duration);
 
         media_manager->Teardown();
 
-        system_controller->DisplayStateLock()->Acquire(ac::DisplayState::Off);
+        system_controller->DisplayStateLock()->Release(ac::DisplayState::Off);
 
         FillResultsFromStatistics(benchmark_result, stats);
         return benchmark_result;
@@ -172,7 +179,9 @@
 TEST(StreamPerformance, EndToEndIsAcceptable) {
     ac::testing::Benchmark::Result reference_result;
 
-    std::ifstream in{ac::testing::stream_performance::kReferenceResultFile};
+    auto ref_path = ac::Utils::GetEnvValue("AETHERCAST_TESTS_REFERENCE_RESULTS",
+                                           ac::testing::stream_performance::kReferenceResultFile);
+    std::ifstream in{ref_path};
     reference_result.load_from_xml(in);
 
     StreamBenchmark benchmark;