Merge lp:~stragerneds/duplicity/duplicity into lp:~duplicity-team/duplicity/0.8-series

[Matthew Glazar]

[lp:~stragerneds/duplicity/duplicity]

1367. By Kenneth Loafman on 2019-05-26

* Fix TestGlobToRegex.test_glob_to_regex for py3.6 and above
  - see https://bugs.python.org/issue29995 for details

1368. By Kenneth Loafman on 2019-05-29

* Merged in lp:~stragerneds/duplicity/duplicity
  - improve test backup speed
  - insure all test output is read

=== modified file 'testing/functional/__init__.py'
--- testing/functional/__init__.py	2018-11-29 19:00:15 +0000
+++ testing/functional/__init__.py	2019-05-26 00:32:44 +0000
@@ -145,9 +145,10 @@
 
         # if the command fails, we need to clear its output
         # so it will terminate cleanly.
-        lines = []
-        while child.isalive():
-            lines.append(child.readline())
+        child.expect_exact(pexpect.EOF)
+        lines = child.before.splitlines()
+        child.wait()
+        child.ptyproc.delayafterclose = 0.0
         return_val = child.exitstatus
 
         if fail:
@@ -171,8 +172,12 @@
         # If a chain ends with time X and the next full chain begins at time X,
         # we may trigger an assert in collections.py.  If needed, sleep to
         # avoid such problems
-        if self.last_backup == int(time.time()):
-            time.sleep(1)
+        now = time.time()
+        if self.last_backup == int(now):
+            seconds_to_sleep = (self.last_backup + 1) - now
+            assert 0 <= seconds_to_sleep <= 1
+            time.sleep(seconds_to_sleep)
+            assert int(time.time()) != self.last_backup
 
         result = self.run_duplicity(options=options, **kwargs)
         self.last_backup = int(time.time())