← Back to branch summary

~maas-committers/maas/1.8

« back to all changes in this revision

Viewing changes to src/provisioningserver/utils/tests/test_fs.py

  • Committer: MAAS Lander
  • Author(s): LaMont Jones
  • Date: 2015-10-14 22:17:34 UTC
  • mfrom: (4053.2.1 atomic-delete-maas-1.8)
  • Revision ID: maas_lander-20151014221734-6exjtpo4e23neby3
[r=lamont][bug=][author=lamont] Have atomic_delete use the same directory for the removal, like it claims to.  This avoids failures do to cross-device links in rename().

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/provisioningserver/utils/tests/test_fs.py
190
190
 
191
191
    def test_renames_file_before_deleting(self):
192
192
        filename = self.make_file()
193
 
        del_filename = ".%s.del" % os.path.basename(filename)
 
193
        del_filename = "%s/.%s.del" % (
 
194
            os.path.dirname(filename), os.path.basename(filename))
194
195
        self.addCleanup(os.remove, del_filename)
195
196
        mock_remove = self.patch(fs_module.os, "remove")
196
197
        atomic_delete(filename)