Merge remote-tracking branch 'origin/master' into pr-2120

Conflicts:
	test/mitmproxy/addons/test_replace.py

1 files changed, 14 insertions, 20 deletions

diff --git a/test/pathod/language/test_generators.py b/test/pathod/language/test_generators.py
index b3ce0335..dc15aaa1 100644
--- a/test/pathod/language/test_generators.py
+++ b/test/pathod/language/test_generators.py
@@ -1,7 +1,4 @@
-import os
-
 from pathod.language import generators
-from mitmproxy.test import tutils
 
 
 def test_randomgenerator():
@@ -15,23 +12,20 @@ def test_randomgenerator():
     assert len(g[1000:1001]) == 0
 
 
-def test_filegenerator():
-    with tutils.tmpdir() as t:
-        path = os.path.join(t, "foo")
-        f = open(path, "wb")
-        f.write(b"x" * 10000)
-        f.close()
-        g = generators.FileGenerator(path)
-        assert len(g) == 10000
-        assert g[0] == b"x"
-        assert g[-1] == b"x"
-        assert g[0:5] == b"xxxxx"
-        assert len(g[1:10]) == 9
-        assert len(g[10000:10001]) == 0
-        assert repr(g)
-        # remove all references to FileGenerator instance to close the file
-        # handle.
-        del g
+def test_filegenerator(tmpdir):
+    f = tmpdir.join("foo")
+    f.write(b"x" * 10000)
+    g = generators.FileGenerator(str(f))
+    assert len(g) == 10000
+    assert g[0] == b"x"
+    assert g[-1] == b"x"
+    assert g[0:5] == b"xxxxx"
+    assert len(g[1:10]) == 9
+    assert len(g[10000:10001]) == 0
+    assert repr(g)
+    # remove all references to FileGenerator instance to close the file
+    # handle.
+    del g
 
 
 def test_transform_generator():