old_contents: import pytest
  from django.utils import timezone
  
  from addons.osfstorage import settings as osfstorage_settings
  from osf.models import BaseFileNode, Folder
  from osf_tests.factories import (
      UserFactory,
      ProjectFactory,
  )
  
  pytestmark = pytest.mark.django_db
  
  @pytest.fixture()
  def user():
      return UserFactory()
  
  @pytest.fixture()
  def project(user):
      return ProjectFactory(creator=user)
  
  
  @pytest.fixture()
  def create_test_file(fake):
      # TODO: Copied from api_tests/utils.py. DRY this up.
      def _create_test_file(node, user=None, filename=None, create_guid=True):
          filename = filename or fake.file_name()
          user = user or node.creator
          osfstorage = node.get_addon('osfstorage')
          root_node = osfstorage.get_root()
          test_file = root_node.append_file(filename)
  
          if create_guid:
              test_file.get_guid(create=True)
  
          test_file.create_version(user, {
              'object': '06d80e',
              'service': 'cloud',
              osfstorage_settings.WATERBUTLER_RESOURCE: 'osf',
          }, {
              'size': 1337,
              'contentType': 'img/png'
          }).save()
          return test_file
      return _create_test_file
  
  
  def test_active_manager_does_not_return_trashed_file_nodes(project, create_test_file):
      file = create_test_file(node=project)
      deleted_file = create_test_file(node=project)
      deleted_file.delete(user=project.creator, save=True)
      # root folder + file + deleted_file = 3 BaseFileNodes
      assert BaseFileNode.objects.filter(node=project).count() == 3
      # root folder + file = 2 BaseFileNodes
      assert BaseFileNode.active.filter(node=project).count() == 2
  
  def test_folder_update_calls_folder_update_method(project, create_test_file, monkeypatch):
      file = create_test_file(node=project)
      parent_folder = file.parent
      def fake_update(*args, **kwargs):
          return 'patched'
  
      monkeypatch.setattr(Folder, 'update', fake_update)
      folder_retval = parent_folder.update()
      assert folder_retval == 'patched'
  
      file_retval = file.update(revision='wot', data=dict(name='huh', materialized='/yes', modified=None))
      assert file_retval != 'patched'
  
new_contents: import pytest
  
  from addons.osfstorage import settings as osfstorage_settings
  from osf.models import BaseFileNode, Folder, File
  from osf_tests.factories import (
      UserFactory,
      ProjectFactory,
  )
  
  pytestmark = pytest.mark.django_db
  
  @pytest.fixture()
  def user():
      return UserFactory()
  
  @pytest.fixture()
  def project(user):
      return ProjectFactory(creator=user)
  
  
  @pytest.fixture()
  def create_test_file(fake):
      # TODO: Copied from api_tests/utils.py. DRY this up.
      def _create_test_file(node, user=None, filename=None, create_guid=True):
          filename = filename or fake.file_name()
          user = user or node.creator
          osfstorage = node.get_addon('osfstorage')
          root_node = osfstorage.get_root()
          test_file = root_node.append_file(filename)
  
          if create_guid:
              test_file.get_guid(create=True)
  
          test_file.create_version(user, {
              'object': '06d80e',
              'service': 'cloud',
              osfstorage_settings.WATERBUTLER_RESOURCE: 'osf',
          }, {
              'size': 1337,
              'contentType': 'img/png'
          }).save()
          return test_file
      return _create_test_file
  
  
  def test_active_manager_does_not_return_trashed_file_nodes(project, create_test_file):
      file = create_test_file(node=project)
      deleted_file = create_test_file(node=project)
      deleted_file.delete(user=project.creator, save=True)
      # root folder + file + deleted_file = 3 BaseFileNodes
      assert BaseFileNode.objects.filter(node=project).count() == 3
      # root folder + file = 2 BaseFileNodes
      assert BaseFileNode.active.filter(node=project).count() == 2
  
  def test_folder_update_calls_folder_update_method(project, create_test_file):
      file = create_test_file(node=project)
      parent_folder = file.parent
      # the folder update method should be the Folder.update method
      assert parent_folder.__class__.update == Folder.update
      # the folder update method should not be the File update method
      assert parent_folder.__class__.update != File.update
      # the file update method should be the File update method
      assert file.__class__.update == File.update
  
subject: Change file/folder update method test to make more sense and be simpler.