tests: Use simple capture system

capturer does not work in some of tests environment.

kedifa/test.py

@@ -17,7 +17,7 @@
 # See COPYING file for full licensing terms.
 # See https://www.nexedi.com/licensing for rationale and options.
 
-import capturer
+import contextlib
 import datetime
 import httplib
 import ipaddress
@@ -27,6 +27,8 @@ import requests
 import requests.exceptions
 import shutil
 import signal
+import StringIO
+import sys
 import tempfile
 import time
 import unittest
@@ -45,6 +47,17 @@ from cli import getter
 from cli import http
 
 
+@contextlib.contextmanager
+def captured_output():
+  new_out, new_err = StringIO.StringIO(), StringIO.StringIO()
+  old_out, old_err = sys.stdout, sys.stderr
+  try:
+    sys.stdout, sys.stderr = new_out, new_err
+    yield sys.stdout, sys.stderr
+  finally:
+    sys.stdout, sys.stderr = old_out, old_err
+
+
 class KedifaIntegrationTest(unittest.TestCase):
   def createKey(self):
     key = rsa.generate_private_key(
@@ -162,16 +175,17 @@ class KedifaIntegrationTest(unittest.TestCase):
     self.cas = cas.split()
 
     kedifa_key_pem, csr_file = self.generateCSR(unicode(common_name))
-    with capturer.CaptureOutput() as captured:
+    with captured_output() as (out, err):
       caucase.cli.main(argv=self.cas + [
         '--send-csr', csr_file
       ])
 
+    self.assertEqual('', err.getvalue().strip())
+    output = out.getvalue().strip()
     try:
-      csr_id = captured.get_text().split()[0]
+      csr_id = output.split()[0]
     except IndexError:
-      self.fail('capturer failed on %s' % (captured.get_text().split(),))
-
+      self.fail('csr_id parse failed: %s' % (output,))
     caucase.cli.main(argv=self.cas + [
        '--get-crt', csr_id, kedifa_key_pem
     ])
@@ -331,12 +345,13 @@ class KedifaIntegrationTest(unittest.TestCase):
         self.kedifa_url + self.reference, cert=incorrect_key_pem)
 
   def revokeCaucaseServiceCertifice(self):
-    with capturer.CaptureOutput() as captured:
+    with captured_output() as (out, err):
       caucase.cli.main(argv=self.cas + [
         '--revoke-crt', self.client_key_pem, self.client_key_pem
       ])
 
-    self.assertEqual('', captured.get_text())
+    self.assertEqual('', out.getvalue().strip())
+    self.assertEqual('', err.getvalue().strip())
 
   def test_GET_revoked_identity(self):
     self.put()

setup.py

@@ -21,7 +21,6 @@ from setuptools import setup, find_packages
 import versioneer
 
 tests_require = [
-    'capturer',
     'urllib3 >= 1.18',  # https://github.com/urllib3/urllib3/issues/258
     'ipaddress',
 ]