Changeset a7d09

Timestamp:

03/04/10 09:15:36 (2 years ago)

Author:

dthomp <dthompso@…>

Branches:

connections

Parents:

8a171

git-author:

dthomp <dthompso@…> (03/04/10 09:15:36)

git-committer:

dthomp <dthompso@…> (03/04/10 09:15:36)

Message:

Fixed some typos and alter MemoryConnectionManager to return a Deferred from cleanAll.

Location:

plasma

Files:

• connections/memory_connection_manager.py (modified) (3 diffs)
• test/connections/test_connection_manager.py (modified) (2 diffs)

plasma/connections/memory_connection_manager.py

@@ -1 +1 @@
 import time
+
+from twisted.internet import defer, reactor
 
 from connection import Connection
@@ -83 +85 @@
         """
         if id in self._connections:
-            if self._connetions[id]['last_active'] < cutoff:
+            if self._connections[id]['last_active'] < cutoff:
                 self.delete(id)
 
@@ -102 +104 @@
         # another function changes self._connections.
         iter = self._connections.keys().__iter__()
-        
+        d = defer.Deferred() 
         def _cleanLater():
            try:
                id = iter.next()
                self.clean(id, cutoff)
-               defer.callLater(0, _cleanLater)
+               reactor.callLater(0, _cleanLater)
            except StopIteration:
+               d.callback(None)
                pass
 
-        _cleanLater()
+        reactor.callLater(0, _cleanLater)
+        return d

plasma/test/connections/test_connection_manager.py

@@ +1 @@
+import time
+
 from twisted.internet import defer
 from twisted.trial import unittest
@@ -75 +77 @@
 
     def test_clean(self):
-        pass
+        id = 'new id'
+        def _assertConnectionNotFound(failure):
+            self.assertIsInstance(failure.value, ConnectionNotFoundError)
+
+        def _assertCleaned(result, id):
+            d = defer.maybeDeferred(self.manager.load, id)
+            d.addCallback(self.failCallback, "Connection not cleaned.")
+            d.addErrback(_assertConnectionNotFound)
+
+        def _clean(result, connection):
+            time.sleep(1)
+            d = defer.maybeDeferred(self.manager.clean, connection.id, time.time())
+            d.addCallback(_assertCleaned, connection.id)
+
+        def _saveConnection(connection):
+            d = defer.maybeDeferred(self.manager.save, connection)
+            d.addCallback(_clean, connection)
+
+        d = self.manager.get(id)
+        d.addCallback(_saveConnection)
 
     def test_cleanAll(self):
-        pass
+        id = 'new id'
+
+        def _assertConnectionNotFound(failure):
+            self.assertIsInstance(failure.value, ConnectionNotFoundError)
+
+        def _assertCleaned(result, id):
+            d = defer.maybeDeferred(self.manager.load, id)
+            d.addCallback(self.failCallback, "Connection not cleaned.")
+            d.addErrback(_assertConnectionNotFound)
+       
+        def _cleanAll(result, connection):
+            time.sleep(1)
+            d = defer.maybeDeferred(self.manager.cleanAll, time.time())
+            d.addCallback(_assertCleaned, connection.id)
+
+        def _saveConnection(connection):
+            d = defer.maybeDeferred(self.manager.save, connection)
+            d.addCallback(_cleanAll, connection)
+
+        d = self.manager.get(id)
+        d.addCallback(_saveConnection)