Bug 1240084: disable jockey-gtk and deja-dup-monitor startup; r=jmaher
authorDustin J. Mitchell <dustin@mozilla.com>
Fri, 15 Jan 2016 19:39:05 +0000
changeset 317218 26ae585be6f6c09f5f1c30e3c756b892b569e77a
parent 317217 5026fb2da3f2d8eca6dae63f164d11e13813c8ee
child 317219 64ae16c5a2814494297de30144aa11ad63201717
push id1079
push userjlund@mozilla.com
push dateFri, 15 Apr 2016 21:02:33 +0000
treeherdermozilla-release@575fbf6786d5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1240084
milestone46.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1240084: disable jockey-gtk and deja-dup-monitor startup; r=jmaher
testing/docker/desktop-test/Dockerfile
testing/docker/desktop-test/VERSION
testing/docker/desktop-test/deja-dup-monitor.desktop
testing/docker/desktop-test/jockey-gtk.desktop
--- a/testing/docker/desktop-test/Dockerfile
+++ b/testing/docker/desktop-test/Dockerfile
@@ -40,16 +40,19 @@ RUN            chown -R root:root /home/
 
 # clean up
 RUN rm -Rf .cache && mkdir -p .cache
 
 # Disable Ubuntu update prompt
 # http://askubuntu.com/questions/515161/ubuntu-12-04-disable-release-notification-of-14-04-in-update-manager
 ADD release-upgrades /etc/update-manager/release-upgrades
 
+# Disable tools with on-login popups that interfere with tests; see bug 1240084 and bug 984944.
+ADD jockey-gtk.desktop deja-dup-monitor.desktop /etc/xdg/autostart/
+
 # In test.sh we accept START_VNC to start a vnc daemon.
 # Exposing this port allows it to work.
 EXPOSE 5900
 
 # This helps not forgetting setting DISPLAY=:0 when running
 # tests outside of test.sh
 ENV DISPLAY :0
 
--- a/testing/docker/desktop-test/VERSION
+++ b/testing/docker/desktop-test/VERSION
@@ -1,1 +1,1 @@
-0.5.6
+0.5.7
new file mode 100644
--- /dev/null
+++ b/testing/docker/desktop-test/deja-dup-monitor.desktop
@@ -0,0 +1,19 @@
+[Desktop Entry]
+Version=1.0
+X-Ubuntu-Gettext-Domain=deja-dup
+
+Name=Backup Monitor
+Comment=Schedules backups at regular intervals
+
+Icon=deja-dup
+TryExec=/usr/lib/deja-dup/deja-dup/deja-dup-monitor
+Exec=/usr/lib/deja-dup/deja-dup/deja-dup-monitor
+
+# Bug 984944/1240084 - It prevents taking screenshots
+X-GNOME-Autostart-Delay=false
+
+StartupNotify=false
+NoDisplay=true
+
+Type=Application
+Categories=System;Utility;Archiving;
new file mode 100644
--- /dev/null
+++ b/testing/docker/desktop-test/jockey-gtk.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Name=Check for new hardware drivers
+Comment=Notify about new hardware drivers available for the system
+Icon=jockey
+Exec=sh -c "test -e /var/cache/jockey/check || exec jockey-gtk --check"
+Terminal=false
+Type=Application
+Categories=System;Settings;GTK;HardwareSettings;
+NotShowIn=KDE;
+X-Ubuntu-Gettext-Domain=jockey
+
+# Bug 984944/1240084 - It prevents taking screenshots
+X-GNOME-Autostart-Delay=false
+
+NoDisplay=true