From e2fb2d0f4e3cad90750fcf9bdd8070b016aa31ea Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Fri, 17 Jan 2020 09:45:39 -0500 Subject: [PATCH] remove "rm" uses from test suite --- src/allmydata/test/check_grid.py | 2 +- src/allmydata/test/test_system.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/allmydata/test/check_grid.py b/src/allmydata/test/check_grid.py index 3f5d64da2..d3993ee5e 100644 --- a/src/allmydata/test/check_grid.py +++ b/src/allmydata/test/check_grid.py @@ -140,7 +140,7 @@ class GridTester(object): if f not in oldfiles: raise CommandFailed("um, '%s' was supposed to already be in %s" % (f, dirname)) - self.cli("rm", absfilename) + self.cli("unlink", absfilename) newfiles = self.listdir(dirname) if f in newfiles: raise CommandFailed("failed to remove '%s' from %s" % (f, dirname)) diff --git a/src/allmydata/test/test_system.py b/src/allmydata/test/test_system.py index 49aebc2cc..2b7660705 100644 --- a/src/allmydata/test/test_system.py +++ b/src/allmydata/test/test_system.py @@ -2227,8 +2227,8 @@ class SystemTest(SystemTestMixin, RunBinTahoeMixin, unittest.TestCase): self.failUnlessEqual(data, "data to be uploaded: file1\n") d.addCallback(_check_outfile1) - d.addCallback(run, "rm", "tahoe-file0") - d.addCallback(run, "rm", "tahoe:file2") + d.addCallback(run, "unlink", "tahoe-file0") + d.addCallback(run, "unlink", "tahoe:file2") d.addCallback(run, "ls") d.addCallback(_check_ls, [], ["tahoe-file0", "file2"])