openstack/swift
Code Issues Proposed changes

Merge "use testCase.assert instead of assert and try...except"

Browse Source
This commit is contained in:
Jenkins 2013-08-23 08:45:16 +00:00 committed by Gerrit Code Review
commit d2ccfa85c6
1 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
test/unit/common/test_utils.py
View File

@ -1445,14 +1445,14 @@ log_name = %(yarr)s'''
def test_ismount_path_does_not_exist(self): def test_ismount_path_does_not_exist(self):
tmpdir = mkdtemp() tmpdir = mkdtemp()
try: try:
assert utils.ismount(os.path.join(tmpdir, 'bar')) is False self.assertFalse(utils.ismount(os.path.join(tmpdir, 'bar')))
finally: finally:
shutil.rmtree(tmpdir) shutil.rmtree(tmpdir)
def test_ismount_path_not_mount(self): def test_ismount_path_not_mount(self):
tmpdir = mkdtemp() tmpdir = mkdtemp()
try: try:
assert utils.ismount(tmpdir) is False self.assertFalse(utils.ismount(tmpdir))
finally: finally:
shutil.rmtree(tmpdir) shutil.rmtree(tmpdir)
@ -1464,12 +1464,7 @@ log_name = %(yarr)s'''
tmpdir = mkdtemp() tmpdir = mkdtemp()
try: try:
with patch("os.lstat", _mock_os_lstat): with patch("os.lstat", _mock_os_lstat):
try: self.assertRaises(OSError, utils.ismount, tmpdir)
utils.ismount(tmpdir)
except OSError:
pass
else:
self.fail("Expected OSError")
finally: finally:
shutil.rmtree(tmpdir) shutil.rmtree(tmpdir)
@ -1478,12 +1473,12 @@ log_name = %(yarr)s'''
try: try:
link = os.path.join(tmpdir, "tmp") link = os.path.join(tmpdir, "tmp")
os.symlink("/tmp", link) os.symlink("/tmp", link)
assert utils.ismount(link) is False self.assertFalse(utils.ismount(link))
finally: finally:
shutil.rmtree(tmpdir) shutil.rmtree(tmpdir)
def test_ismount_path_is_root(self): def test_ismount_path_is_root(self):
assert utils.ismount('/') is True self.assertTrue(utils.ismount('/'))
def test_ismount_parent_path_error(self): def test_ismount_parent_path_error(self):
@ -1498,12 +1493,7 @@ log_name = %(yarr)s'''
tmpdir = mkdtemp() tmpdir = mkdtemp()
try: try:
with patch("os.lstat", _mock_os_lstat): with patch("os.lstat", _mock_os_lstat):
try: self.assertRaises(OSError, utils.ismount, tmpdir)
utils.ismount(tmpdir)
except OSError:
pass
else:
self.fail("Expected OSError")
finally: finally:
shutil.rmtree(tmpdir) shutil.rmtree(tmpdir)
@ -1528,12 +1518,7 @@ log_name = %(yarr)s'''
tmpdir = mkdtemp() tmpdir = mkdtemp()
try: try:
with patch("os.lstat", _mock_os_lstat): with patch("os.lstat", _mock_os_lstat):
try: self.assertTrue(utils.ismount(tmpdir))
utils.ismount(tmpdir)
except OSError:
self.fail("Unexpected exception")
else:
pass
finally: finally:
shutil.rmtree(tmpdir) shutil.rmtree(tmpdir)
@ -1560,12 +1545,7 @@ log_name = %(yarr)s'''
tmpdir = mkdtemp() tmpdir = mkdtemp()
try: try:
with patch("os.lstat", _mock_os_lstat): with patch("os.lstat", _mock_os_lstat):
try: self.assertTrue(utils.ismount(tmpdir))
utils.ismount(tmpdir)
except OSError:
self.fail("Unexpected exception")
else:
pass
finally: finally:
shutil.rmtree(tmpdir) shutil.rmtree(tmpdir)