Merge remote-tracking branch 'origin/master' into 3416.test-encode-python-3

.codecov.yml

@@ -0,0 +1,34 @@
+# Override defaults for codecov.io checks.
+#
+# Documentation is at https://docs.codecov.io/docs/codecov-yaml;
+# reference is at https://docs.codecov.io/docs/codecovyml-reference.
+#
+# To validate this file, use:
+#
+#   curl --data-binary @.codecov.yml https://codecov.io/validate
+#
+# Codecov's defaults seem to leave red marks in GitHub CI checks in a
+# rather arbitrary manner, probably because of non-determinism in
+# coverage (see https://tahoe-lafs.org/trac/tahoe-lafs/ticket/2891)
+# and maybe because computers are bad with floating point numbers.
+
+# Allow coverage percentage a precision of zero decimals, and round to
+# the nearest number (for example, 89.957 to to 90; 89.497 to 89%).
+# Coverage above 90% is good, below 80% is bad.
+coverage:
+  round: nearest
+  range: 80..90
+  precision: 0
+
+  # Aim for a target test coverage of 90% in codecov/project check (do
+  # not allow project coverage to drop below that), and allow
+  # codecov/patch a threshold of 1% (allow coverage in changes to drop
+  # by that much, and no less).  That should be good enough for us.
+  status:
+    project:
+      default:
+        target: 90%
+        threshold: 1%
+    patch:
+      default:
+        threshold: 1%

src/allmydata/stats.py

@@ -1,5 +1,7 @@
 from __future__ import print_function
 
+from past.builtins import unicode
+
 import json
 import os
 import pprint
@@ -155,6 +157,8 @@ class StatsProvider(Referenceable, service.MultiService):
         service.MultiService.startService(self)
 
     def count(self, name, delta=1):
+        if isinstance(name, unicode):
+            name = name.encode("utf-8")
         val = self.counters.setdefault(name, 0)
         self.counters[name] = val + delta
 
@@ -170,7 +174,18 @@ class StatsProvider(Referenceable, service.MultiService):
         return ret
 
     def remote_get_stats(self):
-        return self.get_stats()
+        # The remote API expects keys to be bytes:
+        def to_bytes(d):
+            result = {}
+            for (k, v) in d.items():
+                if isinstance(k, unicode):
+                    k = k.encode("utf-8")
+                result[k] = v
+            return result
+
+        stats = self.get_stats()
+        return {b"counters": to_bytes(stats["counters"]),
+                b"stats": to_bytes(stats["stats"])}
 
     def _connected(self, gatherer, nickname):
         gatherer.callRemoteOnly('provide', self, nickname or '')

src/allmydata/storage/immutable.py

@@ -1,4 +1,15 @@
-from future.utils import bytes_to_native_str
+"""
+Ported to Python 3.
+"""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+from future.utils import PY2, bytes_to_native_str
+if PY2:
+    from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min  # noqa: F401
 
 import os, stat, struct, time
 

src/allmydata/test/test_storage.py

@@ -3006,3 +3006,38 @@ class Stats(unittest.TestCase):
         self.failUnless(output["get"]["95_0_percentile"] is None, output)
         self.failUnless(output["get"]["99_0_percentile"] is None, output)
         self.failUnless(output["get"]["99_9_percentile"] is None, output)
+
+
+class ShareFileTests(unittest.TestCase):
+    """Tests for allmydata.storage.immutable.ShareFile."""
+
+    def get_sharefile(self):
+        sf = ShareFile(self.mktemp(), max_size=1000, create=True)
+        sf.write_share_data(0, b"abc")
+        sf.write_share_data(2, b"DEF")
+        # Should be b'abDEF' now.
+        return sf
+
+    def test_read_write(self):
+        """Basic writes can be read."""
+        sf = self.get_sharefile()
+        self.assertEqual(sf.read_share_data(0, 3), b"abD")
+        self.assertEqual(sf.read_share_data(1, 4), b"bDEF")
+
+    def test_reads_beyond_file_end(self):
+        """Reads beyond the file size are truncated."""
+        sf = self.get_sharefile()
+        self.assertEqual(sf.read_share_data(0, 10), b"abDEF")
+        self.assertEqual(sf.read_share_data(5, 10), b"")
+
+    def test_too_large_write(self):
+        """Can't do write larger than file size."""
+        sf = self.get_sharefile()
+        with self.assertRaises(DataTooLargeError):
+            sf.write_share_data(0, b"x" * 3000)
+
+    def test_no_leases_cancelled(self):
+        """If no leases were cancelled, IndexError is raised."""
+        sf = self.get_sharefile()
+        with self.assertRaises(IndexError):
+            sf.cancel_lease(b"garbage")

src/allmydata/util/_python3.py

@@ -38,6 +38,7 @@ PORTED_MODULES = [
     "allmydata.storage.common",
     "allmydata.storage.crawler",
     "allmydata.storage.expirer",
+    "allmydata.storage.immutable",
     "allmydata.storage.lease",
     "allmydata.storage.mutable",
     "allmydata.storage.shares",