StringIO to six

This commit is contained in:
Tomas Kopecek 2017-05-03 15:07:11 +02:00
parent cab2c7b4ea
commit b4c7433cc4
23 changed files with 165 additions and 215 deletions

View file

@ -1,13 +1,10 @@
from __future__ import absolute_import
import unittest
import StringIO as stringio
import os
import sys
import mock
import six
from . import loadcli
@ -19,7 +16,7 @@ class TestAddHost(unittest.TestCase):
# Show long diffs in error output...
maxDiff = None
@mock.patch('sys.stdout', new_callable=stringio.StringIO)
@mock.patch('sys.stdout', new_callable=six.StringIO)
@mock.patch('koji_cli.activate_session')
def test_handle_add_host(self, activate_session_mock, stdout):
host = 'host'
@ -49,7 +46,7 @@ class TestAddHost(unittest.TestCase):
session.addHost.assert_called_once_with(host, arches, **kwargs)
self.assertNotEqual(rv, 1)
@mock.patch('sys.stdout', new_callable=stringio.StringIO)
@mock.patch('sys.stdout', new_callable=six.StringIO)
@mock.patch('koji_cli.activate_session')
def test_handle_add_host_no_krb_principal(
self, activate_session_mock, stdout):
@ -76,7 +73,7 @@ class TestAddHost(unittest.TestCase):
session.addHost.assert_called_once_with(host, arches)
self.assertNotEqual(rv, 1)
@mock.patch('sys.stdout', new_callable=stringio.StringIO)
@mock.patch('sys.stdout', new_callable=six.StringIO)
@mock.patch('koji_cli.activate_session')
def test_handle_add_host_dupl(self, activate_session_mock, stdout):
host = 'host'
@ -103,8 +100,8 @@ class TestAddHost(unittest.TestCase):
session.addHost.assert_not_called()
self.assertEqual(rv, 1)
@mock.patch('sys.stdout', new_callable=stringio.StringIO)
@mock.patch('sys.stderr', new_callable=stringio.StringIO)
@mock.patch('sys.stdout', new_callable=six.StringIO)
@mock.patch('sys.stderr', new_callable=six.StringIO)
@mock.patch('koji_cli.activate_session')
def test_handle_add_host_help(self, activate_session_mock, stderr, stdout):
arguments = []
@ -134,7 +131,7 @@ class TestAddHost(unittest.TestCase):
session.addHost.assert_not_called()
self.assertEqual(cm.exception.code, 2)
@mock.patch('sys.stdout', new_callable=stringio.StringIO)
@mock.patch('sys.stdout', new_callable=six.StringIO)
@mock.patch('koji_cli.activate_session')
def test_handle_add_host_failed(self, activate_session_mock, stdout):
host = 'host'