From cfed4432a0d8daf335fe0891ac55e520bac580c0 Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <thomas@kriechbaumer.name>
Date: Wed, 24 May 2017 17:25:12 +0200
Subject: pathod: fix leaking fds

---
 test/pathod/language/test_generators.py | 12 +++++-------
 test/pathod/test_test.py                |  3 +--
 test/pathod/tservers.py                 |  1 +
 3 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'test/pathod')

diff --git a/test/pathod/language/test_generators.py b/test/pathod/language/test_generators.py
index 6a67ab72..5e64c726 100644
--- a/test/pathod/language/test_generators.py
+++ b/test/pathod/language/test_generators.py
@@ -14,16 +14,14 @@ def test_randomgenerator():
 
 def test_filegenerator(tmpdir):
     f = tmpdir.join("foo")
-    f.write(b"x" * 10000)
+    f.write(b"abcdefghijklmnopqrstuvwxyz" * 1000)
     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) == 26000
+    assert g[0] == b"a"
+    assert g[2:7] == b"cdefg"
     assert len(g[1:10]) == 9
-    assert len(g[10000:10001]) == 0
+    assert len(g[26000:26001]) == 0
     assert repr(g)
-    g.close()
 
 
 def test_transform_generator():
diff --git a/test/pathod/test_test.py b/test/pathod/test_test.py
index 30d0a473..d51a2c7a 100644
--- a/test/pathod/test_test.py
+++ b/test/pathod/test_test.py
@@ -2,7 +2,6 @@ import os
 import requests
 import pytest
 
-from mitmproxy.test import tutils
 from pathod import test
 from pathod.pathod import SSLOptions, CA_CERT_NAME
 
@@ -27,7 +26,7 @@ class TestDaemonManual:
         d = test.Daemon(ssl=True, ssloptions=ssloptions)
         rsp = requests.get(
             "https://localhost:%s/p/202:da" % d.port,
-            verify=os.path.join(d.thread.server.ssloptions.confdir, CA_CERT_NAME))
+            verify=os.path.expanduser(os.path.join(d.thread.server.ssloptions.confdir, CA_CERT_NAME)))
         assert rsp.ok
         assert rsp.status_code == 202
         d.shutdown()
diff --git a/test/pathod/tservers.py b/test/pathod/tservers.py
index 3dc26311..a7c92964 100644
--- a/test/pathod/tservers.py
+++ b/test/pathod/tservers.py
@@ -1,3 +1,4 @@
+import os
 import tempfile
 import re
 import shutil
-- 
cgit v1.2.3