From a75591d4fe7f172423445f0ecdc9bdec22a50331 Mon Sep 17 00:00:00 2001 From: Aleksei Kuzmin Date: Mon, 3 Jun 2019 17:33:07 +0200 Subject: [PATCH 1/2] build: use python-dbusmock v0.18.1 on Linux To prevent timeout errors with some other python-dbusmock versions. --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7557d7b57dbe2..f17aef1b0b115 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ locales \ lsb-release \ nano \ - python-dbusmock \ + python-dbus \ python-pip \ python-setuptools \ sudo \ @@ -33,6 +33,9 @@ RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \ # crcmod is required by gsutil, which is used for filling the gclient git cache RUN pip install -U crcmod +# dbusmock is needed for Electron tests +RUN pip install python-dbusmock==0.18.1 + RUN mkdir /tmp/workspace RUN chown builduser:builduser /tmp/workspace From 17efad1143b69674ed1443eb3d364211adb325c3 Mon Sep 17 00:00:00 2001 From: Alexey Kuzmin Date: Mon, 3 Jun 2019 20:32:21 +0200 Subject: [PATCH 2/2] Don't use a fixed version of python-dbusmock Co-Authored-By: John Kleinschmidt --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f17aef1b0b115..bae76aaf3cb7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,7 +34,7 @@ RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \ RUN pip install -U crcmod # dbusmock is needed for Electron tests -RUN pip install python-dbusmock==0.18.1 +RUN pip install python-dbusmock RUN mkdir /tmp/workspace RUN chown builduser:builduser /tmp/workspace