Merge "Skip test_check_doubled_words hacking check UT"

Author: Zuul

nova/tests/unit/test_hacking.py

@@ -12,7 +12,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import sys
 import textwrap
 
 import mock
@@ -581,9 +580,8 @@ def test_check_config_option_in_central_place(self):
 
     # TODO(cdent): Remove when https://bugs.launchpad.net/nova/+bug/1804062
     # is resolved.
-    @testtools.skipIf(
-        sys.version_info[0:3] >= (3, 6, 7),
-        'tokenize has backwards incompatible behavior from 3.6.7')
+    @testtools.skip(
+        'tokenize has backwards incompatible behavior from 3.6.7 and 2.7.15')
     def test_check_doubled_words(self):
         errors = [(1, 0, "N343")]