From 054a4175c3ef048d5ae08a6d5862988ca281a803 Mon Sep 17 00:00:00 2001 From: Eric Harney Date: Mon, 26 Sep 2016 10:31:17 -0400 Subject: [PATCH] Hacking: remove check for "tests/unit/integrated" This directory no longer exists, so it does not need to be listed here. Change-Id: I06847e6f9bd551332e9319889073eaface8b6a76 --- cinder/hacking/checks.py | 3 --- cinder/tests/unit/test_hacking.py | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/cinder/hacking/checks.py b/cinder/hacking/checks.py index 176d4e2fd4c..5ce994e11a5 100644 --- a/cinder/hacking/checks.py +++ b/cinder/hacking/checks.py @@ -482,9 +482,6 @@ def check_timeutils_isotime(logical_line): def no_test_log(logical_line, filename, noqa): if "cinder/tests" not in filename or noqa: return - # Skip the "integrated" tests for now - if "cinder/tests/unit/integrated" in filename: - return msg = "C309: Unit tests should not perform logging." if logging_instance.match(logical_line): yield (0, msg) diff --git a/cinder/tests/unit/test_hacking.py b/cinder/tests/unit/test_hacking.py index b4393f1c2c7..9648cc28475 100644 --- a/cinder/tests/unit/test_hacking.py +++ b/cinder/tests/unit/test_hacking.py @@ -443,8 +443,7 @@ class HackingTestCase(test.TestCase): (1, 'LOG.debug', "cinder/tests/fake.py", False), (0, 'LOG.info.assert_called_once_with', "cinder/tests/fake.py", False), (0, 'some.LOG.error.call', "cinder/tests/fake.py", False), - (0, 'LOG.warning', "cinder/tests/unit/fake.py", True), - (0, 'LOG.warning', "cinder/tests/unit/integrated/fake.py", False)) + (0, 'LOG.warning', "cinder/tests/unit/fake.py", True)) def test_no_test_log(self, first, second, third, fourth): self.assertEqual(first, len(list(checks.no_test_log( "%s('arg')" % second, third, fourth))))