← Back to branch summary

~divmod-dev/divmod.org/subdomains-2769

« back to all changes in this revision

Viewing changes to Mantissa/xmantissa/test/test_interstore.py

  • Committer: exarkun
  • Date: 2009-07-16 00:24:40 UTC
  • Revision ID: svn-v4:866e43f7-fbfc-0310-8f2a-ec88d1da2979:trunk:17771
Merge mantissa-scheduler-2923

Author: exarkun
Reviewer: mithrandi
Fixes: #2923

Remove all code from Mantissa which instantiates Schedulers or SubSchedulers and
upgrade away persistent attributes which refer to existing such items.  Replace
this with simple adaption of Stores to IScheduler.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Mantissa/xmantissa/test/test_interstore.py
19
19
 
20
20
from epsilon.extime import Time
21
21
 
 
22
from axiom.iaxiom import IScheduler
22
23
from axiom.store import Store
23
24
from axiom.errors import UnsatisfiedRequirement
24
25
from axiom.item import Item, POWERUP_BEFORE
434
435
        """
435
436
        queue = MessageQueue(store=userStore)
436
437
        installOn(queue, userStore)
437
 
        queue.scheduler.now = self.time.peek
 
438
        IScheduler(userStore).now = self.time.peek
438
439
        return userStore, queue
439
440
 
440
441
 
694
695
        slowRouter.flushMessages(dropAcks=True, dropAckErrorType=errorType)
695
696
        # It should be scheduled.
696
697
        self.assertEqual(
697
 
            len(list(self.bobQueue.scheduler.scheduledTimes(self.bobQueue))),
 
698
            len(list(IScheduler(self.bobQueue.store).scheduledTimes(self.bobQueue))),
698
699
            1)
699
700
        # Now let's run it and see if the ack gets redelivered.
700
701
        self.runQueue(self.bobQueue)
900
901
            Identifier(u"nothing", u"alice", u"example.com"),
901
902
            Identifier(u"suitcase", u"bob", u"example.com"),
902
903
            Value(u"custom.message.type", "Message2"))
903
 
        time1 ,= self.aliceQueue.scheduler.scheduledTimes(self.aliceQueue)
 
904
        [time1] = IScheduler(self.aliceQueue.store).scheduledTimes(self.aliceQueue)
904
905
        time2 = self.runQueue(self.aliceQueue)
905
906
        self.assertEqual(time2 - self.time.peek(), self.retransmitDelta)
906
907
        self.assertEqual(self.receiver.receivedCount, 0)
965
966
        self.assertEqual(bucket, [])
966
967
        self.runQueue(self.aliceQueue)
967
968
        slowRouter.flushMessages(dropAcks=True)
968
 
        time1 ,= self.bobQueue.scheduler.scheduledTimes(self.bobQueue)
 
969
        [time1] = IScheduler(self.bobQueue.store).scheduledTimes(self.bobQueue)
969
970
        time2 = self.runQueue(self.bobQueue)
970
971
        self.assertEqual(time2 - self.time.peek(), self.retransmitDelta)
971
972
        slowRouter.flushMessages()