old_contents: 
  from __future__ import print_function
  
  import shutil
  import os
  from nose.plugins.attrib import attr
  
  from model_test_helper import ModelTestHelper
  
  # FIXME: use a test generator here:
  # http://nose.readthedocs.org/en/latest/writing_tests.html
  
  class TestBasicRun(ModelTestHelper):
      """
      Basic runs. Run and check return code.
      """
  
      def __init__(self):
          super(TestBasicRun, self).__init__()
  
      def pre_run_cleanup(self, exp):
  
          paths = self.make_paths(exp)
  
          try:
              shutil.rmtree(paths['archive'])
              os.remove(paths['archive_link'])
          except OSError, e:
              if not e.strerror == 'No such file or directory':
                  raise e
  
  
      def test_ACCESS_OM_360x300(self):
          """
          Run a tiny ACCESS-OM experiment.
  
          Do two runs to check that restart work correctly.
          """
  
          self.pre_run_cleanup('om_360x300-test')
          self.do_basic_access_run('om_360x300-test', model='om')
          self.do_basic_access_run('om_360x300-test', model='om')
  
      def test_ACCESS_CM_360x300(self):
          """
          Run a tiny ACCESS-CM experiment.
          """
  
          self.pre_run_cleanup('cm_360x300-test')
          self.do_basic_access_run('cm_360x300-test')
          self.do_basic_access_run('cm_360x300-test')
  
      @attr('slow')
      def test_ACCESS_OM_1440x1080(self):
          """
          Run the ACCESS-OM_1440x1080 experiment.
          """
  
          self.pre_run_cleanup('om_1440x1080-test')
          self.do_basic_access_run('om_1440x1080-test', model='om')
          self.do_basic_access_run('om_1440x1080-test', model='om')
  
  
      @attr('slow')
      def test_ACCESS_CM_1440x1080(self):
          """
          Run the ACCESS-CM_1440x1080 experiment.
          """
  
          self.pre_run_cleanup('cm_1440x1080-test')
          self.do_basic_access_run('cm_1440x1080-test')
          self.do_basic_access_run('cm_1440x1080-test')
  
new_contents: 
  from __future__ import print_function
  
  import shutil
  import os
  from nose.plugins.attrib import attr
  
  from model_test_helper import ModelTestHelper
  
  # FIXME: use a test generator here:
  # http://nose.readthedocs.org/en/latest/writing_tests.html
  
  class TestBasicRun(ModelTestHelper):
      """
      Basic runs. Run and check return code.
      """
  
      def __init__(self):
          super(TestBasicRun, self).__init__()
  
      def pre_run_cleanup(self, exp):
  
          paths = self.make_paths(exp)
  
          try:
              shutil.rmtree(paths['archive'])
              os.remove(paths['archive_link'])
          except OSError, e:
              if not e.strerror == 'No such file or directory':
                  raise e
  
  
      def test_ACCESS_OM_360x300(self):
          """
          Run the ACCESS-OM_360x300 experiment.
  
          Do two runs to check that restart work correctly.
          """
  
          self.pre_run_cleanup('om_360x300-test')
          self.do_basic_access_run('om_360x300-test', model='om')
          self.do_basic_access_run('om_360x300-test', model='om')
  
      def test_ACCESS_CM_360x300(self):
          """
          Run the ACCESS-CM_360x300 experiment.
          """
  
          self.pre_run_cleanup('cm_360x300-test')
          self.do_basic_access_run('cm_360x300-test')
          self.do_basic_access_run('cm_360x300-test')
  
      @attr('slow')
      def test_ACCESS_OM_1440x1080(self):
          """
          Run the ACCESS-OM_1440x1080 experiment.
          """
  
          self.pre_run_cleanup('om_1440x1080-test')
          self.do_basic_access_run('om_1440x1080-test', model='om')
          self.do_basic_access_run('om_1440x1080-test', model='om')
  
  
      @attr('slow')
      def test_ACCESS_CM_1440x1080(self):
          """
          Run the ACCESS-CM_1440x1080 experiment.
          """
  
          self.pre_run_cleanup('cm_1440x1080-test')
          self.do_basic_access_run('cm_1440x1080-test')
          self.do_basic_access_run('cm_1440x1080-test')
  
subject: Fix some test descriptions.