1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
|
diff --git a/testbed/test_common_request_handler/test_asyncio.py b/testbed/test_common_request_handler/test_asyncio.py
index 0042a55..4442c53 100644
--- a/testbed/test_common_request_handler/test_asyncio.py
+++ b/testbed/test_common_request_handler/test_asyncio.py
@@ -61,14 +61,14 @@ class TestAsyncio(OpenTracingTestCase):
lambda: len(self.tracer.finished_spans()) >= 2)
self.loop.run_forever()
- self.assertEquals('message1::response', res_future1.result())
- self.assertEquals('message2::response', res_future2.result())
+ self.assertEqual('message1::response', res_future1.result())
+ self.assertEqual('message2::response', res_future2.result())
spans = self.tracer.finished_spans()
- self.assertEquals(len(spans), 2)
+ self.assertEqual(len(spans), 2)
for span in spans:
- self.assertEquals(span.tags.get(tags.SPAN_KIND, None),
+ self.assertEqual(span.tags.get(tags.SPAN_KIND, None),
tags.SPAN_KIND_RPC_CLIENT)
self.assertNotSameTrace(spans[0], spans[1])
@@ -81,12 +81,12 @@ class TestAsyncio(OpenTracingTestCase):
async def do():
with self.tracer.start_active_span('parent'):
response = await self.client.send_task('no_parent')
- self.assertEquals('no_parent::response', response)
+ self.assertEqual('no_parent::response', response)
self.loop.run_until_complete(do())
spans = self.tracer.finished_spans()
- self.assertEquals(len(spans), 2)
+ self.assertEqual(len(spans), 2)
child_span = get_one_by_operation_name(spans, 'send')
self.assertIsNotNone(child_span)
@@ -107,17 +107,17 @@ class TestAsyncio(OpenTracingTestCase):
client = Client(req_handler, self.loop)
response = await client.send_task('correct_parent')
- self.assertEquals('correct_parent::response', response)
+ self.assertEqual('correct_parent::response', response)
# Send second request, now there is no active parent,
# but it will be set, ups
response = await client.send_task('wrong_parent')
- self.assertEquals('wrong_parent::response', response)
+ self.assertEqual('wrong_parent::response', response)
self.loop.run_until_complete(do())
spans = self.tracer.finished_spans()
- self.assertEquals(len(spans), 3)
+ self.assertEqual(len(spans), 3)
spans = sorted(spans, key=lambda x: x.start_time)
parent_span = get_one_by_operation_name(spans, 'parent')
diff --git a/testbed/test_common_request_handler/test_gevent.py b/testbed/test_common_request_handler/test_gevent.py
index 975d2ca..862c0ff 100644
--- a/testbed/test_common_request_handler/test_gevent.py
+++ b/testbed/test_common_request_handler/test_gevent.py
@@ -57,14 +57,14 @@ class TestGevent(OpenTracingTestCase):
gevent.joinall([response_greenlet1, response_greenlet2])
- self.assertEquals('message1::response', response_greenlet1.get())
- self.assertEquals('message2::response', response_greenlet2.get())
+ self.assertEqual('message1::response', response_greenlet1.get())
+ self.assertEqual('message2::response', response_greenlet2.get())
spans = self.tracer.finished_spans()
- self.assertEquals(len(spans), 2)
+ self.assertEqual(len(spans), 2)
for span in spans:
- self.assertEquals(span.tags.get(tags.SPAN_KIND, None),
+ self.assertEqual(span.tags.get(tags.SPAN_KIND, None),
tags.SPAN_KIND_RPC_CLIENT)
self.assertNotSameTrace(spans[0], spans[1])
@@ -76,10 +76,10 @@ class TestGevent(OpenTracingTestCase):
with self.tracer.start_active_span('parent'):
response = self.client.send_sync('no_parent')
- self.assertEquals('no_parent::response', response)
+ self.assertEqual('no_parent::response', response)
spans = self.tracer.finished_spans()
- self.assertEquals(len(spans), 2)
+ self.assertEqual(len(spans), 2)
child_span = get_one_by_operation_name(spans, 'send')
self.assertIsNotNone(child_span)
@@ -98,13 +98,13 @@ class TestGevent(OpenTracingTestCase):
client = Client(RequestHandler(self.tracer, scope.span.context))
response = client.send_sync('correct_parent')
- self.assertEquals('correct_parent::response', response)
+ self.assertEqual('correct_parent::response', response)
response = client.send_sync('wrong_parent')
- self.assertEquals('wrong_parent::response', response)
+ self.assertEqual('wrong_parent::response', response)
spans = self.tracer.finished_spans()
- self.assertEquals(len(spans), 3)
+ self.assertEqual(len(spans), 3)
spans = sorted(spans, key=lambda x: x.start_time)
parent_span = get_one_by_operation_name(spans, 'parent')
diff --git a/testbed/test_common_request_handler/test_threads.py b/testbed/test_common_request_handler/test_threads.py
index 4135698..b721b12 100644
--- a/testbed/test_common_request_handler/test_threads.py
+++ b/testbed/test_common_request_handler/test_threads.py
@@ -56,14 +56,14 @@ class TestThreads(OpenTracingTestCase):
response_future1 = self.client.send('message1')
response_future2 = self.client.send('message2')
- self.assertEquals('message1::response', response_future1.result(5.0))
- self.assertEquals('message2::response', response_future2.result(5.0))
+ self.assertEqual('message1::response', response_future1.result(5.0))
+ self.assertEqual('message2::response', response_future2.result(5.0))
spans = self.tracer.finished_spans()
- self.assertEquals(len(spans), 2)
+ self.assertEqual(len(spans), 2)
for span in spans:
- self.assertEquals(span.tags.get(tags.SPAN_KIND, None),
+ self.assertEqual(span.tags.get(tags.SPAN_KIND, None),
tags.SPAN_KIND_RPC_CLIENT)
self.assertNotSameTrace(spans[0], spans[1])
@@ -75,10 +75,10 @@ class TestThreads(OpenTracingTestCase):
with self.tracer.start_active_span('parent'):
response = self.client.send_sync('no_parent')
- self.assertEquals('no_parent::response', response)
+ self.assertEqual('no_parent::response', response)
spans = self.tracer.finished_spans()
- self.assertEquals(len(spans), 2)
+ self.assertEqual(len(spans), 2)
child_span = get_one_by_operation_name(spans, 'send')
self.assertIsNotNone(child_span)
@@ -97,13 +97,13 @@ class TestThreads(OpenTracingTestCase):
client = Client(RequestHandler(self.tracer, scope.span.context),
self.executor)
response = client.send_sync('correct_parent')
- self.assertEquals('correct_parent::response', response)
+ self.assertEqual('correct_parent::response', response)
response = client.send_sync('wrong_parent')
- self.assertEquals('wrong_parent::response', response)
+ self.assertEqual('wrong_parent::response', response)
spans = self.tracer.finished_spans()
- self.assertEquals(len(spans), 3)
+ self.assertEqual(len(spans), 3)
spans = sorted(spans, key=lambda x: x.start_time)
parent_span = get_one_by_operation_name(spans, 'parent')
diff --git a/testbed/test_listener_per_request/test_asyncio.py b/testbed/test_listener_per_request/test_asyncio.py
index b5731f9..c627a55 100644
--- a/testbed/test_listener_per_request/test_asyncio.py
+++ b/testbed/test_listener_per_request/test_asyncio.py
@@ -37,7 +37,7 @@ class TestAsyncio(OpenTracingTestCase):
def test_main(self):
client = Client(self.tracer, self.loop)
res = client.send_sync('message')
- self.assertEquals(res, 'message::response')
+ self.assertEqual(res, 'message::response')
spans = self.tracer.finished_spans()
self.assertEqual(len(spans), 1)
diff --git a/testbed/test_listener_per_request/test_gevent.py b/testbed/test_listener_per_request/test_gevent.py
index 5300e38..fb32257 100644
--- a/testbed/test_listener_per_request/test_gevent.py
+++ b/testbed/test_listener_per_request/test_gevent.py
@@ -35,7 +35,7 @@ class TestGevent(OpenTracingTestCase):
def test_main(self):
client = Client(self.tracer)
res = client.send_sync('message')
- self.assertEquals(res, 'message::response')
+ self.assertEqual(res, 'message::response')
spans = self.tracer.finished_spans()
self.assertEqual(len(spans), 1)
diff --git a/testbed/test_listener_per_request/test_threads.py b/testbed/test_listener_per_request/test_threads.py
index d69b998..7dbb896 100644
--- a/testbed/test_listener_per_request/test_threads.py
+++ b/testbed/test_listener_per_request/test_threads.py
@@ -35,7 +35,7 @@ class TestThreads(OpenTracingTestCase):
def test_main(self):
client = Client(self.tracer)
res = client.send_sync('message')
- self.assertEquals(res, 'message::response')
+ self.assertEqual(res, 'message::response')
spans = self.tracer.finished_spans()
self.assertEqual(len(spans), 1)
diff --git a/testbed/test_multiple_callbacks/test_asyncio.py b/testbed/test_multiple_callbacks/test_asyncio.py
index 2e29dd2..89945d2 100644
--- a/testbed/test_multiple_callbacks/test_asyncio.py
+++ b/testbed/test_multiple_callbacks/test_asyncio.py
@@ -34,7 +34,7 @@ class TestAsyncio(OpenTracingTestCase):
self.loop.run_forever()
spans = self.tracer.finished_spans()
- self.assertEquals(len(spans), 4)
+ self.assertEqual(len(spans), 4)
self.assertNamesEqual(spans, ['task', 'task', 'task', 'parent'])
for i in range(3):
diff --git a/testbed/test_multiple_callbacks/test_gevent.py b/testbed/test_multiple_callbacks/test_gevent.py
index f680507..7194d75 100644
--- a/testbed/test_multiple_callbacks/test_gevent.py
+++ b/testbed/test_multiple_callbacks/test_gevent.py
@@ -28,7 +28,7 @@ class TestGevent(OpenTracingTestCase):
gevent.wait(timeout=5.0)
spans = self.tracer.finished_spans()
- self.assertEquals(len(spans), 4)
+ self.assertEqual(len(spans), 4)
self.assertNamesEqual(spans, ['task', 'task', 'task', 'parent'])
for i in range(3):
diff --git a/testbed/test_multiple_callbacks/test_threads.py b/testbed/test_multiple_callbacks/test_threads.py
index af8e14c..3622cb1 100644
--- a/testbed/test_multiple_callbacks/test_threads.py
+++ b/testbed/test_multiple_callbacks/test_threads.py
@@ -33,7 +33,7 @@ class TestThreads(OpenTracingTestCase):
self.executor.shutdown(True)
spans = self.tracer.finished_spans()
- self.assertEquals(len(spans), 4)
+ self.assertEqual(len(spans), 4)
self.assertNamesEqual(spans, ['task', 'task', 'task', 'parent'])
for i in range(3):
|