summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2010-12-01 13:55:28 +0000
committerLars Wirzenius <liw@liw.fi>2010-12-01 13:55:28 +0000
commit5875729ee2b1dd093d409d25e9c36b6685f5e7e3 (patch)
tree539d512681827344706fc86951cadbbc61bf6fe2
parent9136829252ece8f0c791b96acf9f3ed3720695e8 (diff)
downloadobnam-5875729ee2b1dd093d409d25e9c36b6685f5e7e3.tar.gz
Fix blackboxtest's backup-gen-and-empty-gen-and-forget-first-one test.
-rwxr-xr-xblackboxtest12
1 files changed, 6 insertions, 6 deletions
diff --git a/blackboxtest b/blackboxtest
index e789144f..431f99c3 100755
--- a/blackboxtest
+++ b/blackboxtest
@@ -102,6 +102,7 @@ class ObnamTestCase(unittest.TestCase):
return self.runcmd(['./obnam',
'--quiet',
'--log', 'blackboxtest-obnam.log',
+ '--log-level', 'debug',
'--client-name', self.client_name] +
args, stderr_ignore=stderr_ignore)
@@ -454,7 +455,7 @@ class ForgetTests(ObnamTestCase):
st = fs.lstat(os.path.join(dirname, filename))
usage += st.st_blocks * 512
return usage
-
+
def random_string(self, size):
return ''.join(chr(random.randint(0, 255)) for i in xrange(size))
@@ -471,12 +472,11 @@ class ForgetTests(ObnamTestCase):
shutil.rmtree(self.data)
os.mkdir(self.data)
self.backup()
- genids = self.generations()[:-1]
+ genids = self.generations()
forgettable = genids[:-1]
- print "forgetting:", forgettable, genids
- self.forget(genids=genids)
- self.assertEqual(self.disk_usage(os.path.join(self.store, 'chunks')),
- 0)
+ self.forget(genids=forgettable)
+ chunks = os.path.join(self.store, 'chunks')
+ self.assertEqual(self.disk_usage(chunks), 0)
if __name__ == '__main__':