old_contents: # -*- coding: utf-8 -*-
  '''
  Test the core grains
  '''
  
  # Import python libs
  from __future__ import absolute_import
  
  # Import Salt Testing libs
  from tests.support.case import ModuleCase
  from tests.support.unit import skipIf
  
  # Import Salt libs
  import salt.utils.platform
  if salt.utils.platform.is_windows():
      try:
          import salt.modules.reg
      except ImportError:
          pass
  
  
  class TestGrainsCore(ModuleCase):
      '''
      Test the core grains grains
      '''
      @skipIf(not salt.utils.platform.is_windows(), 'Only run on Windows')
      def test_win_cpu_model(self):
          '''
          test grains['cpu_model']
          '''
          opts = self.minion_opts
          cpu_model_text = salt.modules.reg.read_value(
                  'HKEY_LOCAL_MACHINE',
                  'HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0',
                  'ProcessorNameString').get('vdata')
          self.assertEqual(
              self.run_function('grains.items')['cpu_model'],
              cpu_model_text
          )
  
new_contents: # -*- coding: utf-8 -*-
  '''
  Test the core grains
  '''
  
  # Import python libs
  from __future__ import absolute_import
  
  # Import Salt Testing libs
  from tests.support.case import ModuleCase
  from tests.support.unit import skipIf
  
  # Import Salt libs
  import salt.utils.platform
  if salt.utils.platform.is_windows():
      try:
          import salt.modules.reg
      except ImportError:
          pass
  
  
  def _freebsd_or_openbsd():
      return salt.utils.platform.is_freebsd() or salt.utils.platform.is_openbsd()
  
  
  class TestGrainsCore(ModuleCase):
      '''
      Test the core grains grains
      '''
      @skipIf(not salt.utils.platform.is_windows(), 'Only run on Windows')
      def test_win_cpu_model(self):
          '''
          test grains['cpu_model']
          '''
          cpu_model_text = salt.modules.reg.read_value(
                  'HKEY_LOCAL_MACHINE',
                  'HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0',
                  'ProcessorNameString').get('vdata')
          self.assertEqual(
              self.run_function('grains.items')['cpu_model'],
              cpu_model_text
          )
  
      @skipIf(not _freebsd_or_openbsd(), 'Only run on FreeBSD or OpenBSD')
      def test_freebsd_openbsd_mem_total(self):
          '''
          test grains['mem_total']
          '''
          physmem = self.run_function('sysctl.get', ['hw.physmem'])
          self.assertEqual(
              self.run_function('grains.items')['mem_total'],
              int(physmem) / 1048576
          )
  
      @skipIf(not salt.utils.platform.is_openbsd(), 'Only run on OpenBSD')
      def test_openbsd_swap_total(self):
          '''
          test grains['swap_total']
          '''
          swapmem = self.run_function('cmd.run', ['swapctl -sk']).split(' ')[1]
          self.assertEqual(
              self.run_function('grains.items')['swap_total'],
              int(swapmem) / 1048576
          )
  
subject: Add integration test for (mem|swap)_total grains on OpenBSD