425d465122
Running oslotest's tests fail on Python 3.x because of the "import mock" lines in test_output.py and test_timeout.py. That works for 2.x because "mock" is an independent package, but in 3.x, it's a part of unittest in the standard library. This difference is covered in six.moves, which is where mock is imported from in other test modules. Change-Id: I3882c2a9be8abc93cf95942579cb9562c6377c01 Closes-Bug: #1607963
46 lines
1.7 KiB
Python
46 lines
1.7 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
# 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.
|
|
|
|
from six.moves import mock
|
|
import testtools
|
|
|
|
from oslotest import timeout
|
|
|
|
|
|
class TimeoutTestCase(testtools.TestCase):
|
|
|
|
@mock.patch('os.environ.get')
|
|
@mock.patch.object(timeout.Timeout, 'useFixture')
|
|
@mock.patch('fixtures.Timeout')
|
|
def test_timeout(self, fixture_timeout_mock, fixture_mock, env_get_mock):
|
|
env_get_mock.return_value = 1
|
|
tc = timeout.Timeout()
|
|
tc.setUp()
|
|
env_get_mock.assert_called_once_with('OS_TEST_TIMEOUT', 0)
|
|
fixture_timeout_mock.assert_called_once_with(1, gentle=True)
|
|
self.assertEqual(1, fixture_mock.call_count)
|
|
|
|
@mock.patch('os.environ.get')
|
|
@mock.patch.object(timeout.Timeout, 'useFixture')
|
|
@mock.patch('fixtures.Timeout')
|
|
def test_no_timeout(self, fixture_timeout_mock, fixture_mock,
|
|
env_get_mock):
|
|
# Returning 0 means we don't install the timeout
|
|
env_get_mock.return_value = 0
|
|
tc = timeout.Timeout()
|
|
tc.setUp()
|
|
env_get_mock.assert_called_once_with('OS_TEST_TIMEOUT', 0)
|
|
self.assertEqual(0, fixture_timeout_mock.call_count)
|
|
self.assertEqual(0, fixture_mock.call_count)
|