particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove six.configparser.SafeConfingParser from tests

Browse source 
Fixes: https://pagure.io/koji/issue/3939
This commit is contained in:
Tomas Kopecek 2023-11-09 13:58:53 +01:00
parent 48205e08bd
commit 41869961f6
2 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tests/test_lib/test_utils.py
View file

@ -8,7 +8,6 @@ import mock
import optparse
import os
import resource
import six.moves.configparser
import time
import six
import shutil
@ -240,10 +239,12 @@ class ConfigFileTestCase(unittest.TestCase):
self.manager.isdir = mock.patch("os.path.isdir").start()
self.manager.isfile = mock.patch("os.path.isfile").start()
self.manager.access = mock.patch("os.access", return_value=True).start()
self.manager.cp_clz = mock.patch("six.moves.configparser.ConfigParser",
spec=True).start()
self.manager.scp_clz = mock.patch("six.moves.configparser.SafeConfigParser",
spec=True).start()
if six.PY2:
self.manager.scp_clz = mock.patch("ConfigParser.SafeConfigParser",
spec=True).start()
else:
self.manager.cp_clz = mock.patch("configparser.ConfigParser",
spec=True).start()
self.manager.rcp_clz = mock.patch("six.moves.configparser.RawConfigParser",
spec=True).start()
if six.PY2:

12
tests/test_plugins/test_protonmsg.py
View file

@ -9,7 +9,11 @@ import protonmsg
import mock
import six
from mock import patch, MagicMock
from six.moves.configparser import ConfigParser, SafeConfigParser
if six.PY2:
from ConfigParser import SafeConfigParser as ConfigParser
else:
from configparser import ConfigParser
from koji.context import context
@ -324,11 +328,10 @@ topic_prefix = koji
connect_timeout = 10
send_timeout = 60
""")
conf = ConfigParser()
if six.PY2:
conf = SafeConfigParser()
conf.readfp(confdata)
else:
conf = ConfigParser()
conf.read_file(confdata)
self.handler = protonmsg.TimeoutHandler('amqps://broker1.example.com:5671', [], conf)
@ -349,11 +352,10 @@ topic_prefix = koji
connect_timeout = 10
send_timeout = 60
""")
conf = ConfigParser()
if six.PY2:
conf = SafeConfigParser()
conf.readfp(confdata)
else:
conf = ConfigParser()
conf.read_file(confdata)
handler = protonmsg.TimeoutHandler('amqp://broker1.example.com:5672', [], conf)
event = MagicMock()