PR#1155: cli: fix chroot-list command to work on both python2 and python3 - copr/copr

Dominik Turecek • 4 years ago

9aa8f60

cli/copr_cli/main.py

file modified

+6 -4

		`@@ -11,7 +11,6 @@`
		`import simplejson`
		`import requests`
		`from collections import defaultdict`
		`- from textwrap import indent`

		`import logging`
		`if six.PY2:`
		`@@ -35,7 +34,7 @@`
		`from copr.v3 import (Client, config_from_file, CoprException, CoprRequestException, CoprNoConfigException,`
		`CoprConfigException, CoprNoResultException)`

		`- from .util import ProgressBar, json_dumps`
		`+ from .util import ProgressBar, json_dumps, serializable`
		`from .build_config import MockProfile`

		`import pkg_resources`
		`@@ -538,12 +537,15 @@`
		`def action_list_chroots(self, args):`
		`"""List all currently available chroots.`
		`"""`
		`+ def indent(string):`
		`+ return '\n'.join([' ' + l for l in string.split('\n')])`
		`+`
		`chroots = self.client.mock_chroot_proxy.get_list()`
		`- chroots = simplejson.loads(json_dumps(chroots))`
		`+ chroots = serializable(chroots)`
		`for chroot, comment in chroots.items():`
		`print(chroot)`
		`if comment:`
		`- print(indent(comment, ' '))`
		`+ print(indent(comment))`

		`#########################################################`
		`### Package actions ###`

cli/tests/test_cli.py

file modified

+2 -1

		`@@ -684,7 +684,8 @@`


		`@mock.patch('copr.v3.proxies.mock_chroot.MockChrootProxy.get_list')`
		`- def test_list_chroots(list_chroots):`
		`+ @mock.patch('copr_cli.main.config_from_file', return_value=mock_config)`
		`+ def test_list_chroots(config, list_chroots):`
		`list_chroots.return_value = Munch({`
		`"fedora-18-x86_64": "",`
		`"fedora-17-x86_64": "A short chroot comment",`