openstack/swift
Code Issues Proposed changes

Merge "Py3: Port test/unit/test_ringcomposer.py"

Browse Source
This commit is contained in:
Zuul
2018-12-08 10:05:29 +00:00
committed by Gerrit Code Review
parent 2a3ebc74a1 6c8b4c87a5
commit 17e2a0c456
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/unit/cli/test_ringcomposer.py
View File

@@ -65,7 +65,7 @@ class TestCommands(unittest.TestCase):
for cmd in cmds: for cmd in cmds:
try: try:
with open(self.composite_builder_file, 'wb') as fd: with open(self.composite_builder_file, 'wb') as fd:
fd.write('not json') fd.write(b'not json')
exit_code, stdout, stderr = self._run_composer(cmd) exit_code, stdout, stderr = self._run_composer(cmd)
self.assertEqual(2, exit_code) self.assertEqual(2, exit_code)
self.assertIn('An error occurred while loading the composite ' self.assertIn('An error occurred while loading the composite '

1
tox.ini
View File

@@ -41,6 +41,7 @@ commands =
test/unit/cli/test_relinker.py \ test/unit/cli/test_relinker.py \
test/unit/cli/test_ring_builder_analyzer.py \ test/unit/cli/test_ring_builder_analyzer.py \
test/unit/cli/test_ringbuilder.py \ test/unit/cli/test_ringbuilder.py \
test/unit/cli/test_ringcomposer.py \
test/unit/common/middleware/crypto \ test/unit/common/middleware/crypto \
test/unit/common/middleware/test_catch_errors.py \ test/unit/common/middleware/test_catch_errors.py \
test/unit/common/middleware/test_crossdomain.py \ test/unit/common/middleware/test_crossdomain.py \