old_contents: # -*- coding: utf-8 -*-
  
  # Import Python libs
  from __future__ import absolute_import, print_function, unicode_literals
  
  import logging
  
  import salt.ext.six as six
  
  # Import Salt Testing libs
  from tests.support.case import ModuleCase
  from tests.support.helpers import TstSuiteLoggingHandler, flaky
  from tests.support.unit import skipIf
  
  
  @skipIf(six.PY3, "Runtest Log Hander Disabled for PY3, #41836")
  class LoggingJIDsTest(ModuleCase):
      """
      Validate that JIDs appear in LOGs
      """
  
      def setUp(self):
          """
          Set up
          """
          log_format = "[%(levelname)-8s] %(jid)s %(message)s"
          self.handler = TstSuiteLoggingHandler(format=log_format, level=logging.DEBUG)
  
      @flaky
      def test_jid_in_logs(self):
          """
          Test JID in log_format
          """
          with self.handler:
              self.run_function("test.ping")
              assert (
                  any("JID" in s for s in self.handler.messages) is True
              ), "JID not found in log messages"
  
new_contents: import logging
  
  from tests.support.case import ModuleCase
  from tests.support.helpers import TstSuiteLoggingHandler, flaky
  from tests.support.unit import skipIf
  
  
  @skipIf(True, "Runtest Log Hander Disabled for PY3, #41836")
  class LoggingJIDsTest(ModuleCase):
      """
      Validate that JIDs appear in LOGs
      """
  
      def setUp(self):
          """
          Set up
          """
          log_format = "[%(levelname)-8s] %(jid)s %(message)s"
          self.handler = TstSuiteLoggingHandler(format=log_format, level=logging.DEBUG)
  
      @flaky
      def test_jid_in_logs(self):
          """
          Test JID in log_format
          """
          with self.handler:
              self.run_function("test.ping")
              assert (
                  any("JID" in s for s in self.handler.messages) is True
              ), "JID not found in log messages"
  
subject: Drop Py2 and six on tests/integration/logging/test_jid_logging.py