Changeset e9223fc in trunk

Timestamp:

2010-01-14T22:17:19Z (16 years ago)

Author:

Brian Warner <warner@…>

Branches:

master

Children:

2e098e2

Parents:

731d15e

Message:

hush pyflakes-0.4.0 warnings: slightly less-trivial fixes. Closes #900.

This includes one fix (in test_web) which was testing the wrong thing.

Location:

src/allmydata/test

Files:

• no_network.py (modified) (1 diff)
• test_introducer.py (modified) (1 diff)
• test_node.py (modified) (2 diffs)
• test_observer.py (modified) (2 diffs)
• test_provisioning.py (modified) (2 diffs)
• test_system.py (modified) (1 diff)
• test_uri.py (modified) (2 diffs)
• test_util.py (modified) (2 diffs)
• test_web.py (modified) (1 diff)

src/allmydata/test/no_network.py ¶

@@ -44 +44 @@
     def callRemoteOnly(self, methname, *args, **kwargs):
         d = self.callRemote(methname, *args, **kwargs)
+        del d # explicitly ignored
         return None
 

src/allmydata/test/test_introducer.py ¶

@@ -49 +49 @@
         ic = IntroducerClient(None, "introducer.furl", u"my_nickname",
                               "my_version", "oldest_version")
+        self.failUnless(isinstance(ic, IntroducerClient))
 
     def test_listen(self):

src/allmydata/test/test_node.py ¶

@@ -85 +85 @@
         fileutil.make_dirs(basedir)
         n = TestNode(basedir)
+        self.failUnless(isinstance(n, TestNode))
         self.failUnless(os.path.exists(os.path.join(basedir, "private")))
 
@@ -96 +97 @@
         fileutil.make_dirs(basedir)
         n = TestNode(basedir)
+        self.failUnless(isinstance(n, TestNode))
         privdir = os.path.join(basedir, "private")
         st = os.stat(privdir)

src/allmydata/test/test_observer.py ¶

@@ -13 +13 @@
         ol = observer.OneShotObserverList()
         rep = repr(ol)
+        self.failUnlessEqual(rep, "<OneShotObserverList [[]]>")
         d1 = ol.when_fired()
         d2 = ol.when_fired()
@@ -23 +24 @@
         ol.fire("result")
         rep = repr(ol)
+        self.failUnlessEqual(rep, "<OneShotObserverList -> result>")
         d4 = ol.when_fired()
         dl = defer.DeferredList([d1,d2,d4])

src/allmydata/test/test_provisioning.py ¶

@@ -29 +29 @@
         #unfilled = pt.renderSynchronously(ctx)
         lots_of_stan = pt.do_forms(self.getarg)
+        self.failUnlessEqual(type(lots_of_stan), list)
 
         self.fields = {'filled': True,
@@ -45 +46 @@
         #filled = pt.renderSynchronously(ctx)
         more_stan = pt.do_forms(self.getarg)
+        self.failUnlessEqual(type(more_stan), list)
 
         # trigger the wraparound configuration

src/allmydata/test/test_system.py ¶

@@ -130 +130 @@
             up = upload.Data(DATA, convergence=convergence)
             up.max_segment_size = 1024
-            d1 = self.uploader.upload(up)
+            return self.uploader.upload(up)
         d.addCallback(_upload_again)
 

src/allmydata/test/test_uri.py ¶

@@ -2 +2 @@
 from twisted.trial import unittest
 from allmydata import uri
-from allmydata.util import hashutil
+from allmydata.util import hashutil, base32
 from allmydata.interfaces import IURI, IFileURI, IDirnodeURI, IMutableFileURI, \
     IVerifierURI
@@ -172 +172 @@
 
         readable = uri.unpack_extension_readable(ext)
+        self.failUnlessEqual(readable["needed_shares"], 3)
+        self.failUnlessEqual(readable["stuff"], "value")
+        self.failUnlessEqual(readable["size"], 12)
+        self.failUnlessEqual(readable["big_hash"],
+                             base32.b2a(hashutil.tagged_hash("foo", "bar")))
+        self.failUnlessEqual(readable["UEB_hash"],
+                             base32.b2a(hashutil.uri_extension_hash(ext)))
 
 class Invalid(unittest.TestCase):

src/allmydata/test/test_util.py ¶

@@ -918 +918 @@
         _failUnlessExists("b")
         _failUnlessExists("c")
+        del b2
 
 ctr = [0]
@@ -1492 +1493 @@
         self.calls[2][0].errback(ValueError("three-error"))
 
+        del d1,d2,d3,d4
+
 class SampleError(Exception):
     pass

src/allmydata/test/test_web.py ¶

@@ -3376 +3376 @@
             self.failUnlessEqual(ugood["cap"], self.uris["good"])
             ugoodcrr = ugood["check-and-repair-results"]
-            self.failUnlessEqual(u0crr["repair-attempted"], False)
-            self.failUnlessEqual(u0crr["pre-repair-results"]["results"]["count-shares-good"], 10)
+            self.failUnlessEqual(ugoodcrr["repair-attempted"], False)
+            self.failUnlessEqual(ugoodcrr["pre-repair-results"]["results"]["count-shares-good"], 10)
 
             usick = [u for u in units