Changeset 63b61ce in trunk for src/allmydata/test/test_cli.py

Timestamp:

2010-08-04T07:27:10Z (15 years ago)

Author:

Brian Warner <warner@…>

Branches:

master

Children:

20847dd

Parents:

7b7b0c9

Message:

Rewrite immutable downloader (#798). This patch adds and updates unit tests.

File:

• src/allmydata/test/test_cli.py (modified) (3 diffs)

src/allmydata/test/test_cli.py ¶

@@ -2301 +2301 @@
         d.addCallback(_stash_bad)
 
+        # the download is abandoned as soon as it's clear that we won't get
+        # enough shares. The one remaining share might be in either the
+        # COMPLETE or the PENDING state.
+        in_complete_msg = "ran out of shares: 1 complete, 0 pending, 0 overdue, 0 unused, need 3"
+        in_pending_msg = "ran out of shares: 0 complete, 1 pending, 0 overdue, 0 unused, need 3"
+
         d.addCallback(lambda ign: self.do_cli("get", self.uri_1share))
         def _check1((rc, out, err)):
@@ -2306 +2312 @@
             self.failUnless("410 Gone" in err, err)
             self.failUnlessIn("NotEnoughSharesError: ", err)
-            self.failUnlessIn("Failed to get enough shareholders: have 1, need 3", err)
+            self.failUnless(in_complete_msg in err or in_pending_msg in err,
+                            err)
         d.addCallback(_check1)
 
@@ -2315 +2322 @@
             self.failUnless("410 Gone" in err, err)
             self.failUnlessIn("NotEnoughSharesError: ", err)
-            self.failUnlessIn("Failed to get enough shareholders: have 1, need 3", err)
+            self.failUnless(in_complete_msg in err or in_pending_msg in err,
+                            err)
             self.failIf(os.path.exists(targetf))
         d.addCallback(_check2)