openstack/swift
Code Issues Proposed changes

Py3: Make test_manager py3 compatable

Browse Source 
Fixes: NameError: name 'file' is not defined
file() is removed in python3.x using open()
 will solve it.
Fixes: AttributeError: 'generator' object has no
attribute 'next'
Python3 it is __next__()

Change-Id: Ib2cbdfbbedb86f6e01239d2ee991677727b0548b
This commit is contained in:
Lokesh S 2016-07-27 12:16:26 +00:00 committed by Matthew Oliver
parent e41cbd7415
commit 84aa6558b4
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/unit/common/test_manager.py
View File

@ -610,14 +610,14 @@ class TestServer(unittest.TestCase):
self.assertEqual(pid_file, self.join_run_dir('proxy-server.pid')) self.assertEqual(pid_file, self.join_run_dir('proxy-server.pid'))
self.assertEqual(pid, 1) self.assertEqual(pid, 1)
# ... and only one file # ... and only one file
self.assertRaises(StopIteration, iterator.next) self.assertRaises(StopIteration, next, iterator)
# test invalid value in pid file # test invalid value in pid file
server = manager.Server('auth', run_dir=t) server = manager.Server('auth', run_dir=t)
pid_file, pid = next(server.iter_pid_files()) pid_file, pid = next(server.iter_pid_files())
self.assertIsNone(pid) self.assertIsNone(pid)
# test object-server doesn't steal pids from object-replicator # test object-server doesn't steal pids from object-replicator
server = manager.Server('object', run_dir=t) server = manager.Server('object', run_dir=t)
self.assertRaises(StopIteration, server.iter_pid_files().next) self.assertRaises(StopIteration, next, server.iter_pid_files())
# test multi-pid iter # test multi-pid iter
server = manager.Server('object-replicator', run_dir=t) server = manager.Server('object-replicator', run_dir=t)
real_map = { real_map = {
@ -1129,9 +1129,13 @@ class TestServer(unittest.TestCase):
self.assertEqual(len(server.procs), 3) self.assertEqual(len(server.procs), 3)
proc = server.procs[2] proc = server.procs[2]
# assert stdout is /dev/null # assert stdout is /dev/null
self.assertTrue(isinstance(proc.stdout, file)) with open('/dev/null', 'wb+') as fp:
self.assertTrue(isinstance(proc.stdout, type(fp)))
self.assertEqual(proc.stdout.name, os.devnull) self.assertEqual(proc.stdout.name, os.devnull)
self.assertEqual(proc.stdout.mode, 'w+b') self.assertIn('b', proc.stdout.mode)
self.assertTrue(any(x in proc.stdout.mode for x in 'aw+'),
'mode must be writable, not %r' %
proc.stdout.mode)
self.assertEqual(proc.stderr, proc.stdout) self.assertEqual(proc.stderr, proc.stdout)
# test not daemon over-rides wait # test not daemon over-rides wait
server.spawn(conf4, wait=False, daemon=False, once=True) server.spawn(conf4, wait=False, daemon=False, once=True)

1
tox.ini
View File

@ -31,6 +31,7 @@ commands =
nosetests \ nosetests \
test/unit/common/test_exceptions.py \ test/unit/common/test_exceptions.py \
test/unit/common/test_header_key_dict.py \ test/unit/common/test_header_key_dict.py \
test/unit/common/test_manager.py \
test/unit/common/test_splice.py test/unit/common/test_splice.py
[testenv:py35] [testenv:py35]