[Python-apps-commits] r11200 - in packages/s3ql/trunk/debian (3 files)

[nikratio-guest at users.alioth.debian.org]

    Date: Thursday, August 21, 2014 @ 01:08:13
  Author: nikratio-guest
Revision: 11200

Added fix_failsafe_test_race.diff. Closes: #758013.

Added:
  packages/s3ql/trunk/debian/patches/fix_failsafe_test_race.diff
Modified:
  packages/s3ql/trunk/debian/changelog
  packages/s3ql/trunk/debian/patches/series

Modified: packages/s3ql/trunk/debian/changelog
===================================================================
--- packages/s3ql/trunk/debian/changelog	2014-08-20 02:21:06 UTC (rev 11199)
+++ packages/s3ql/trunk/debian/changelog	2014-08-21 01:08:13 UTC (rev 11200)
@@ -1,3 +1,9 @@
+s3ql (2.10.1+dfsg-3) UNRELEASED; urgency=medium
+
+  * Added fix_failsafe_test_race.diff. Closes: #758013.
+
+ -- Nikolaus Rath <Nikolaus at rath.org>  Wed, 20 Aug 2014 17:30:03 -0700
+
 s3ql (2.10.1+dfsg-2) unstable; urgency=medium
 
   * Bumped python3-dugong dependency to 3.3 to fix build failures

Added: packages/s3ql/trunk/debian/patches/fix_failsafe_test_race.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/fix_failsafe_test_race.diff	                        (rev 0)
+++ packages/s3ql/trunk/debian/patches/fix_failsafe_test_race.diff	2014-08-21 01:08:13 UTC (rev 11200)
@@ -0,0 +1,36 @@
+Description: Fix race condition in unit test
+Origin: upstream (commit  9a8c0eb)
+Forwarded: no
+Last-Update: <2014-08-20>
+Author: Nikolaus Rath <Nikolaus at rath.org>
+
+NewerMetadataTest: take into account that metadata upload is async,
+so fs won't switch to failsafe right away.
+
+--- a/tests/t5_failsafe.py
++++ b/tests/t5_failsafe.py
+@@ -17,6 +17,7 @@
+ import s3ql.ctrl
+ import pytest
+ import errno
++import time
+ from common import get_remote_test_info, NoTestSection
+ from s3ql.backends import gs
+ from argparse import Namespace
+@@ -125,10 +126,13 @@
+         # Try to upload metadata
+         s3ql.ctrl.main(['upload-meta', self.mnt_dir])
+ 
+-        # Try to write
++        # Try to write. We repeat a few times, since the metadata upload
++        # happens asynchronously.
+         with pytest.raises(PermissionError):
+-            with open(fname + 'barz', 'w') as fh:
+-                fh.write('foobar')
++            for _ in range(10):
++                with open(fname + 'barz', 'w') as fh:
++                    fh.write('foobar')
++                time.sleep(1)
+ 
+         self.umount()
+ 

Modified: packages/s3ql/trunk/debian/patches/series
===================================================================
--- packages/s3ql/trunk/debian/patches/series	2014-08-20 02:21:06 UTC (rev 11199)
+++ packages/s3ql/trunk/debian/patches/series	2014-08-21 01:08:13 UTC (rev 11200)
@@ -1,3 +1,4 @@
+fix_failsafe_test_race.diff
 proc_mount.diff
 clock-granularity.diff
 check_dev_fuse_perms.diff