From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Mon, 24 Mar 2008 22:28:04 +0000 (-0700)
Subject: fix check-memory to use new upload API (which requires a "convergence" argument)... 
X-Git-Tag: allmydata-tahoe-1.0.0~16
X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/index.php?a=commitdiff_plain;h=dfdbb9564817e6b1aaa7ab01836abf8e5e3f0f8e;p=tahoe-lafs%2Ftahoe-lafs.git

fix check-memory to use new upload API (which requires a "convergence" argument), and change it to measure convergence instead of random-key, since convergence is the use case we care about more
---

diff --git a/src/allmydata/test/check_memory.py b/src/allmydata/test/check_memory.py
index c01769e7..b6293a5c 100644
--- a/src/allmydata/test/check_memory.py
+++ b/src/allmydata/test/check_memory.py
@@ -367,7 +367,7 @@ this file are ignored.
         if self.mode in ("upload", "upload-self"):
             files[name] = self.create_data(name, size)
             d = self.control_rref.callRemote("upload_from_file_to_uri",
-                                             files[name], convergence=None)
+                                             files[name], convergence="check-memory convergence string")
             def _done(uri):
                 os.remove(files[name])
                 del files[name]
@@ -391,7 +391,7 @@ this file are ignored.
             files[name] = self.create_data(name, size)
             u = self.nodes[0].getServiceNamed("uploader")
             d = self.nodes[0].debug_wait_for_client_connections(self.numnodes+1)
-            d.addCallback(lambda res: u.upload(upload.FileName(files[name])))
+            d.addCallback(lambda res: u.upload(upload.FileName(files[name], convergence="check-memory convergence string")))
             d.addCallback(lambda results: results.uri)
         else:
             raise RuntimeError("unknown mode=%s" % self.mode)