Merge lp:~mwilck/duplicity/0.7-series into lp:~duplicity-team/duplicity/0.7-series

[Martin Wilck]

Fix the regression on Trusty.

[Kenneth Loafman (kenneth-loafman)]

You have a conflict in the merge, see above. You need to start with the latest source.

review: Needs Fixing

[Martin Wilck (mwilck)]

Sorry. I'll be out of office for a week, will look into this later.

[Martin Wilck (mwilck)]

But it's just a whitespace issue - would it be asked too much that you fix it quickly?

[Kenneth Loafman (kenneth-loafman)]

I fixed the patch and applied it to 0.7 and 0.8 both.

review: Approve

=== modified file 'testing/functional/__init__.py'
--- testing/functional/__init__.py	2016-07-28 15:34:42 +0000
+++ testing/functional/__init__.py	2016-07-29 13:50:55 +0000
@@ -39,6 +39,24 @@
 
 class FunctionalTestCase(DuplicityTestCase):
 
+    _setsid_w = None
+
+    @classmethod
+    def _check_setsid(cls):
+        if cls._setsid_w is not None:
+            return
+        if platform.platform().startswith('Linux'):
+            # setsid behavior differs between distributions.
+            # If setsid supports -w ("wait"), use it.
+            import subprocess
+            try:
+                with open("/dev/null", "w") as sink:
+                    subprocess.check_call(["setsid", "-w", "ls"], stdout=sink, stderr=sink)
+            except subprocess.CalledProcessError:
+                cls._setsid_w = False
+            else:
+                cls._setsid_w = True
+
     def setUp(self):
         super(FunctionalTestCase, self).setUp()
 
@@ -55,6 +73,7 @@
         if bl:
             backend_inst.delete(backend_inst.list())
         backend_inst.close()
+        self._check_setsid()
 
     def run_duplicity(self, options=[], current_time=None, fail=None,
                       passphrase_input=[]):
@@ -65,7 +84,13 @@
         # this way we force a failure if duplicity tries to read from the
         # console unexpectedly (like for gpg password or such).
         if platform.platform().startswith('Linux'):
-            cmd_list = ['setsid']
+<<<<<<< TREE
+            cmd_list = ['setsid']
+=======
+            cmd_list = ['setsid']
+            if self._setsid_w:
+                cmd_list.extend(["-w"])
+>>>>>>> MERGE-SOURCE
         else:
             cmd_list = []
         cmd_list.extend(["duplicity"])