4115068f8b
unlink_without_raise was logging exceptions when it failed to unlink a file, which is confusing since it is often called on non-existing files. create_link_without_raise was also logging exceptions when it failed to create a symlink. This patch corrects this behaviour; both functions now explicitly check for the type of error they expect, and then suppress that. If another type of OSError is encountered, a warning is logged. This patch also adds unit tests for both functions. fixes bug 1097931. Change-Id: Ie36f59dce34a6c67765770c5f968c003003acc88
71 lines
2.1 KiB
Python
71 lines
2.1 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
# coding=utf-8
|
|
|
|
# Copyright 2012 Hewlett-Packard Development Company, L.P.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
"""Tests for baremetal utils."""
|
|
|
|
import mox
|
|
|
|
import errno
|
|
import os
|
|
|
|
from nova import exception
|
|
from nova import test
|
|
from nova.virt.baremetal import utils
|
|
|
|
|
|
class BareMetalUtilsTestCase(test.TestCase):
|
|
|
|
def test_random_alnum(self):
|
|
s = utils.random_alnum(10)
|
|
self.assertEqual(len(s), 10)
|
|
s = utils.random_alnum(100)
|
|
self.assertEqual(len(s), 100)
|
|
|
|
def test_unlink(self):
|
|
self.mox.StubOutWithMock(os, "unlink")
|
|
os.unlink("/fake/path")
|
|
|
|
self.mox.ReplayAll()
|
|
utils.unlink_without_raise("/fake/path")
|
|
self.mox.VerifyAll()
|
|
|
|
def test_unlink_ENOENT(self):
|
|
self.mox.StubOutWithMock(os, "unlink")
|
|
os.unlink("/fake/path").AndRaise(OSError(errno.ENOENT))
|
|
|
|
self.mox.ReplayAll()
|
|
utils.unlink_without_raise("/fake/path")
|
|
self.mox.VerifyAll()
|
|
|
|
def test_create_link(self):
|
|
self.mox.StubOutWithMock(os, "symlink")
|
|
os.symlink("/fake/source", "/fake/link")
|
|
|
|
self.mox.ReplayAll()
|
|
utils.create_link_without_raise("/fake/source", "/fake/link")
|
|
self.mox.VerifyAll()
|
|
|
|
def test_create_link_EEXIST(self):
|
|
self.mox.StubOutWithMock(os, "symlink")
|
|
os.symlink("/fake/source", "/fake/link").AndRaise(
|
|
OSError(errno.EEXIST))
|
|
|
|
self.mox.ReplayAll()
|
|
utils.create_link_without_raise("/fake/source", "/fake/link")
|
|
self.mox.VerifyAll()
|