1
=== modified file 'src/txamqp/testlib.py'
2
--- src/txamqp/testlib.py	2009-06-17 16:01:31 +0000
3
+++ src/txamqp/testlib.py	2009-07-09 20:55:26 +0000
4
@@ -25,7 +25,7 @@
5
25
25
6
26
from txamqp.protocol import AMQChannel, AMQClient, TwistedDelegate
26
from txamqp.protocol import AMQChannel, AMQClient, TwistedDelegate
7
27
27
9
28
from twisted.internet import protocol, reactor
28
from twisted.internet import error, protocol, reactor
10
29
from twisted.trial import unittest
29
from twisted.trial import unittest
11
30
from twisted.internet.defer import inlineCallbacks, Deferred, returnValue, DeferredQueue, DeferredLock
30
from twisted.internet.defer import inlineCallbacks, Deferred, returnValue, DeferredQueue, DeferredLock
12
31
from twisted.python import failure
31
from twisted.python import failure
13
@@ -52,6 +52,9 @@
14
52
    return os.environ.get("TXAMQP_BROKER")
52
    return os.environ.get("TXAMQP_BROKER")
15
53
53
16
54
54
17
55
USERNAME='guest'
18
56
PASSWORD='guest'
19
57
VHOST='localhost'
20
55
class TestBase(unittest.TestCase):
58
class TestBase(unittest.TestCase):
21
56
59
22
57
    def __init__(self, *args, **kwargs):
60
    def __init__(self, *args, **kwargs):
23
@@ -75,9 +78,9 @@
24
75
            raise RuntimeError(
78
            raise RuntimeError(
25
76
                "Unsupported broker '%s'. Use one of RABBITMQ, OPENAMQ or "
79
                "Unsupported broker '%s'. Use one of RABBITMQ, OPENAMQ or "
26
77
                "QPID" % broker)
80
                "QPID" % broker)
30
78
        self.user = 'guest'
81
        self.user = USERNAME
31
79
        self.password = 'guest'
82
        self.password = PASSWORD
32
80
        self.vhost = 'localhost'
83
        self.vhost = VHOST
33
81
        self.queues = []
84
        self.queues = []
34
82
        self.exchanges = []
85
        self.exchanges = []
35
83
        self.connectors = []
86
        self.connectors = []
36
@@ -95,6 +98,13 @@
37
95
        onConn = Deferred()
98
        onConn = Deferred()
38
96
        f = protocol._InstanceFactory(reactor, AMQClient(delegate, vhost, txamqp.spec.load(spec)), onConn)
99
        f = protocol._InstanceFactory(reactor, AMQClient(delegate, vhost, txamqp.spec.load(spec)), onConn)
39
97
        c = reactor.connectTCP(host, port, f)
100
        c = reactor.connectTCP(host, port, f)
40
101
        def errb(thefailure):
41
102
            thefailure.trap(error.ConnectionRefusedError)
42
103
            print "failed to connect to host: %s, port: %s; These tests are designed to run against a running instance" \
43
104
                  " of the %s AMQP broker on the given host and port.  failure: %s" % (_get_broker(), host, port, thefailure,)
44
105
            thefailure.raiseException()
45
106
        onConn.addErrback(errb)
46
107
47
98
        self.connectors.append(c)
108
        self.connectors.append(c)
48
99
        client = yield onConn
109
        client = yield onConn
49
100
110
50
@@ -103,7 +113,14 @@
51
103
 
113
 
52
104
    @inlineCallbacks
114
    @inlineCallbacks
53
105
    def setUp(self):
115
    def setUp(self):
55
106
        self.client = yield self.connect()
116
        try:
56
117
            self.client = yield self.connect()
57
118
        except txamqp.client.Closed, le:
58
119
            le.args = tuple(("Unable to connect to AMQP broker in order to run tests (perhaps due to auth failure?). " \
59
120
                "The tests assume that an instance of the %s AMQP broker is already set up and that this test script " \
60
121
                "can connect to it and use it as user '%s', password '%s', vhost '%s'." % (_get_broker(),
61
122
                    USERNAME, PASSWORD, VHOST),) + le.args)
62
123
            raise
63
107
124
64
108
        self.channel = yield self.client.channel(1)
125
        self.channel = yield self.client.channel(1)
65
109
        yield self.channel.channel_open()
126
        yield self.channel.channel_open()
Reviewer	Review Type	Date Requested	Status
Thomas Herve		2009-07-16	Approve on 2009-07-17
Dan Di Spaltro	code	2009-07-09	Approve on 2009-07-17
Zooko Wilcox-O'Hearn (community)		2009-07-16	Approve on 2009-07-17
Esteve Fernandez			Approve on 2009-07-09
Terry Jones		2009-07-16	Pending
Review via email: mp+8496@code.staging.launchpad.net