[Merge] lp:~jonas-drange/ubuntu-download-manager/consistent-fs-interaction into lp:ubuntu-download-manager

[Olivier Tilloy]

Review: Approve

My knowledge of that code is very limited, but the change looks sound. I’ve added a minor suggestion inline.

Diff comments:

> === modified file 'tests/common/daemon_testcase.cpp'
> --- tests/common/daemon_testcase.cpp	2015-02-25 16:24:24 +0000
> +++ tests/common/daemon_testcase.cpp	2016-08-09 20:03:22 +0000
> @@ -233,15 +233,19 @@
>      if (_httpServerDir.isEmpty()) {
>          _httpServerDir = testDirectory() + "/http_server";
>          qDebug() << "Server dir:" << _httpServerDir;
> -
> -        if (!QDir().exists(_httpServerDir))
> -            QDir().mkpath(_httpServerDir);
>      }
> +
> +    if (!QDir().exists(_httpServerDir))
> +        QDir().mkpath(_httpServerDir);
> +

How about:

  if (!QDir(_httpServerDir).exists())
      QDir::root().mkpath(_httpServerDir);

>      return _httpServerDir;
>  }
>  
>  void
>  DaemonTestCase::startHttpServer() {
> +    if (_httpServerRetry > 10) {
> +        QFAIL("Could not start http server.");
> +    }
>      qDebug() << "Start http server";
>      auto serverDir = httpServerDir();
>      _httpServer = new QProcess();


-- 
https://code.launchpad.net/~jonas-drange/ubuntu-download-manager/consistent-fs-interaction/+merge/302468
Your team Ubuntu Phablet Team is subscribed to branch lp:ubuntu-download-manager.