Merge lp:~pitti/autopilot/launch-uri-stdout into lp:autopilot

[Martin Pitt]

Don't inherit our stdout to spawned processes, to allow users to redirect
autopilot's stdout to tee and other programs which wait for EOF.

Don't inherit our stdout to spawned processes, to allow users to redirect
autopilot's stdout to tee and other programs which wait for EOF and not cause
hangs. See bug for details.

[Martin Pitt (pitti)]

Please consider https://bugs.launchpad.net/autopilot/+bug/1259721/comments/8 when reviewing this, this is a design decision which we have to make.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:398
http://jenkins.qa.ubuntu.com/job/autopilot-ci/358/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-amd64-ci/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-armhf-ci/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-trusty-i386-ci/84

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/358/rebuild

review: Approve (continuous-integration)

[Thomi Richards (thomir-deactivatedaccount)]

Pitti,

I've merged your other MP, because it seems like the correct thing to do. However, we also want this one I think (we don't care about stdout in this case, and it clutters the test output). However, your other MP said they were mutually exclusive: I can't see why that should be though. Can't we have both?

Cheers,

review: Needs Fixing

[Martin Pitt (pitti)]

Well, they don't conflict technically of course, but my thought was that if we would merge this we wouldn't need to merge the remmina fix as that would then serve to make sure that this case of leaked processes is being handled gracefully. So "mutually exclusive" was too strong indeed.

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

=== modified file 'autopilot/process/_bamf.py'
--- autopilot/process/_bamf.py	2013-12-09 16:33:31 +0000
+++ autopilot/process/_bamf.py	2013-12-11 15:02:46 +0000
@@ -327,8 +327,13 @@
         if type(files) is not list:
             raise TypeError("files must be a list.")
         proc = Gio.DesktopAppInfo.new(desktop_file)
-        # FIXME: second item is a GEerror
-        proc.launch_uris(files, None)
+        # simple launch_uris() uses GLib.SpawnFlags.SEARCH_PATH by default
+        # only, but this inherits stdout; we don't want that as it hangs when
+        # tee'ing autopilot output into a file
+        proc.launch_uris_as_manager(
+            files, None,
+            GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.STDOUT_TO_DEV_NULL,
+            None, None, None, None)
         if wait:
             self.wait_until_application_is_running(desktop_file, 10)
         return proc

=== modified file 'debian/control'
--- debian/control	2013-12-02 02:02:45 +0000
+++ debian/control	2013-12-11 15:02:46 +0000
@@ -85,7 +85,7 @@
 Recommends: python3-xlib,
             python3-evdev,
             gir1.2-gconf-2.0,
-            gir1.2-glib-2.0,
+            gir1.2-glib-2.0 (>= 1.39.0-0ubuntu1),
             gir1.2-gtk-3.0,
             gir1.2-ibus-1.0,
             libautopilot-gtk (>= 1.4),
@@ -136,7 +136,7 @@
 Section: metapackages
 Depends: ${misc:Depends},
          gir1.2-gconf-2.0,
-         gir1.2-glib-2.0,
+         gir1.2-glib-2.0 (>= 1.39.0-0ubuntu1),
          gir1.2-gtk-3.0,
          gir1.2-ibus-1.0,
          python-autopilot,