Changeset 4e41144 in trunk

Timestamp:

2020-12-23T14:14:06Z (4 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

1bdca90, 2c7dde9, 574613a, 5a543fd

Parents:

f9ee4b23 (diff), 0133889 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Itamar Turner-Trauring <itamar@…> (2020-12-23 14:14:06)

git-committer:

GitHub <noreply@…> (2020-12-23 14:14:06)

Message:

Merge pull request #944 from tahoe-lafs/3572.pypy-has-no-refcounting

Fix intermittent failing test on PyPy?

Fixes ticket:3572

Files:

• newsfragments/3572.minor (added)
• src/allmydata/test/test_system.py (modified) (2 diffs)

src/allmydata/test/test_system.py ¶

@@ -2328 +2328 @@
             data = "data to be uploaded: file%d\n" % i
             datas.append(data)
-            open(fn,"wb").write(data)
+            with open(fn, "wb") as f:
+                f.write(data)
 
         def _check_stdout_against(out_and_err, filenum=None, data=None):
@@ -2506 +2507 @@
         dn = os.path.join(self.basedir, "dir1")
         os.makedirs(dn)
-        open(os.path.join(dn, "rfile1"), "wb").write("rfile1")
-        open(os.path.join(dn, "rfile2"), "wb").write("rfile2")
-        open(os.path.join(dn, "rfile3"), "wb").write("rfile3")
+        with open(os.path.join(dn, "rfile1"), "wb") as f:
+            f.write("rfile1")
+        with open(os.path.join(dn, "rfile2"), "wb") as f:
+            f.write("rfile2")
+        with open(os.path.join(dn, "rfile3"), "wb") as f:
+            f.write("rfile3")
         sdn2 = os.path.join(dn, "subdir2")
         os.makedirs(sdn2)
-        open(os.path.join(sdn2, "rfile4"), "wb").write("rfile4")
-        open(os.path.join(sdn2, "rfile5"), "wb").write("rfile5")
+        with open(os.path.join(sdn2, "rfile4"), "wb") as f:
+            f.write("rfile4")
+        with open(os.path.join(sdn2, "rfile5"), "wb") as f:
+            f.write("rfile5")
 
         # from disk into tahoe