Skip to content

Commit 9c45787

Browse files
Ferenc-Ferenc-
committed
refactor(tests): Clean up old PEP-249 tests
* Use the `unittest` module's `assert` in unit tests. * Drop legacy branching for unsupported 2.7 * Eliminate unused variables * Remove superfluous initializations * Use unpack assignments Signed-off-by: Ferenc Géczi <[email protected]>
1 parent fe295bb commit 9c45787

File tree

3 files changed

+51
-104
lines changed

3 files changed

+51
-104
lines changed

‎tests/clients/test_mysqlclient.py‎

Lines changed: 16 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,12 @@
66
import sys
77
import logging
88
import unittest
9+
import MySQLdb
910
from ..helpers import testenv
1011
from unittest import SkipTest
1112
from instana.singletons import tracer
1213

1314

14-
if sys.version_info[0] > 2:
15-
import MySQLdb
16-
else:
17-
raise SkipTest("mysqlclient supported on Python 3 only")
18-
1915
logger = logging.getLogger(__name__)
2016

2117
create_table_query = 'CREATE TABLE IF NOT EXISTS users(id serial primary key, \
@@ -75,24 +71,22 @@ def test_vanilla_query(self):
7571
self.assertEqual(0, len(spans))
7672

7773
def test_basic_query(self):
78-
result = None
7974
with tracer.start_active_span('test'):
8075
result = self.cursor.execute("""SELECT * from users""")
8176
self.cursor.fetchone()
8277

83-
assert(result >= 0)
78+
self.assertTrue(result >= 0)
8479

8580
spans = self.recorder.queued_spans()
8681
self.assertEqual(2, len(spans))
8782

88-
db_span = spans[0]
89-
test_span = spans[1]
83+
db_span, test_span = spans
9084

9185
self.assertEqual("test", test_span.data["sdk"]["name"])
9286
self.assertEqual(test_span.t, db_span.t)
9387
self.assertEqual(db_span.p, test_span.s)
9488

95-
self.assertEqual(None, db_span.ec)
89+
self.assertIsNone(db_span.ec)
9690

9791
self.assertEqual(db_span.n, "mysql")
9892
self.assertEqual(db_span.data["mysql"]["db"], testenv['mysql_db'])
@@ -102,7 +96,6 @@ def test_basic_query(self):
10296
self.assertEqual(db_span.data["mysql"]["port"], testenv['mysql_port'])
10397

10498
def test_basic_insert(self):
105-
result = None
10699
with tracer.start_active_span('test'):
107100
result = self.cursor.execute(
108101
"""INSERT INTO users(name, email) VALUES(%s, %s)""",
@@ -113,14 +106,13 @@ def test_basic_insert(self):
113106
spans = self.recorder.queued_spans()
114107
self.assertEqual(2, len(spans))
115108

116-
db_span = spans[0]
117-
test_span = spans[1]
109+
db_span, test_span = spans
118110

119111
self.assertEqual("test", test_span.data["sdk"]["name"])
120112
self.assertEqual(test_span.t, db_span.t)
121113
self.assertEqual(db_span.p, test_span.s)
122114

123-
self.assertEqual(None, db_span.ec)
115+
self.assertIsNone(db_span.ec)
124116

125117
self.assertEqual(db_span.n, "mysql")
126118
self.assertEqual(db_span.data["mysql"]["db"], testenv['mysql_db'])
@@ -130,7 +122,6 @@ def test_basic_insert(self):
130122
self.assertEqual(db_span.data["mysql"]["port"], testenv['mysql_port'])
131123

132124
def test_executemany(self):
133-
result = None
134125
with tracer.start_active_span('test'):
135126
result = self.cursor.executemany("INSERT INTO users(name, email) VALUES(%s, %s)",
136127
[('beaker', '[email protected]'), ('beaker', '[email protected]')])
@@ -141,14 +132,13 @@ def test_executemany(self):
141132
spans = self.recorder.queued_spans()
142133
self.assertEqual(2, len(spans))
143134

144-
db_span = spans[0]
145-
test_span = spans[1]
135+
db_span, test_span = spans
146136

147137
self.assertEqual("test", test_span.data["sdk"]["name"])
148138
self.assertEqual(test_span.t, db_span.t)
149139
self.assertEqual(db_span.p, test_span.s)
150140

151-
self.assertEqual(None, db_span.ec)
141+
self.assertIsNone(db_span.ec)
152142

153143
self.assertEqual(db_span.n, "mysql")
154144
self.assertEqual(db_span.data["mysql"]["db"], testenv['mysql_db'])
@@ -158,23 +148,21 @@ def test_executemany(self):
158148
self.assertEqual(db_span.data["mysql"]["port"], testenv['mysql_port'])
159149

160150
def test_call_proc(self):
161-
result = None
162151
with tracer.start_active_span('test'):
163152
result = self.cursor.callproc('test_proc', ('beaker',))
164153

165-
assert(result)
154+
self.assertTrue(result)
166155

167156
spans = self.recorder.queued_spans()
168157
self.assertEqual(2, len(spans))
169158

170-
db_span = spans[0]
171-
test_span = spans[1]
159+
db_span, test_span = spans
172160

173161
self.assertEqual("test", test_span.data["sdk"]["name"])
174162
self.assertEqual(test_span.t, db_span.t)
175163
self.assertEqual(db_span.p, test_span.s)
176164

177-
self.assertEqual(None, db_span.ec)
165+
self.assertIsNone(db_span.ec)
178166

179167
self.assertEqual(db_span.n, "mysql")
180168
self.assertEqual(db_span.data["mysql"]["db"], testenv['mysql_db'])
@@ -185,24 +173,19 @@ def test_call_proc(self):
185173

186174
def test_error_capture(self):
187175
result = None
188-
span = None
189176
try:
190177
with tracer.start_active_span('test'):
191178
result = self.cursor.execute("""SELECT * from blah""")
192179
self.cursor.fetchone()
193180
except Exception:
194181
pass
195-
finally:
196-
if span:
197-
span.finish()
198182

199-
assert(result is None)
183+
self.assertIsNone(result)
200184

201185
spans = self.recorder.queued_spans()
202186
self.assertEqual(2, len(spans))
203187

204-
db_span = spans[0]
205-
test_span = spans[1]
188+
db_span, test_span = spans
206189

207190
self.assertEqual("test", test_span.data["sdk"]["name"])
208191
self.assertEqual(test_span.t, db_span.t)
@@ -227,8 +210,7 @@ def test_connect_cursor_ctx_mgr(self):
227210
spans = self.recorder.queued_spans()
228211
self.assertEqual(2, len(spans))
229212

230-
db_span = spans[0]
231-
test_span = spans[1]
213+
db_span, test_span = spans
232214

233215
self.assertEqual("test", test_span.data["sdk"]["name"])
234216
self.assertEqual(test_span.t, db_span.t)
@@ -253,8 +235,7 @@ def test_connect_ctx_mgr(self):
253235
spans = self.recorder.queued_spans()
254236
self.assertEqual(2, len(spans))
255237

256-
db_span = spans[0]
257-
test_span = spans[1]
238+
db_span, test_span = spans
258239

259240
self.assertEqual("test", test_span.data["sdk"]["name"])
260241
self.assertEqual(test_span.t, db_span.t)
@@ -279,8 +260,7 @@ def test_cursor_ctx_mgr(self):
279260
spans = self.recorder.queued_spans()
280261
self.assertEqual(2, len(spans))
281262

282-
db_span = spans[0]
283-
test_span = spans[1]
263+
db_span, test_span = spans
284264

285265
self.assertEqual("test", test_span.data["sdk"]["name"])
286266
self.assertEqual(test_span.t, db_span.t)

‎tests/clients/test_psycopg2.py‎

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ def tearDown(self):
6464
return None
6565

6666
def test_vanilla_query(self):
67-
assert psycopg2.extras.register_uuid(None, self.db)
68-
assert psycopg2.extras.register_uuid(None, self.db.cursor())
67+
self.assertTrue(psycopg2.extras.register_uuid(None, self.db))
68+
self.assertTrue(psycopg2.extras.register_uuid(None, self.db.cursor()))
6969

7070
self.cursor.execute("""SELECT * from users""")
7171
result = self.cursor.fetchone()
@@ -84,14 +84,13 @@ def test_basic_query(self):
8484
spans = self.recorder.queued_spans()
8585
self.assertEqual(2, len(spans))
8686

87-
db_span = spans[0]
88-
test_span = spans[1]
87+
db_span, test_span = spans
8988

9089
self.assertEqual("test", test_span.data["sdk"]["name"])
9190
self.assertEqual(test_span.t, db_span.t)
9291
self.assertEqual(db_span.p, test_span.s)
9392

94-
self.assertEqual(None, db_span.ec)
93+
self.assertIsNone(db_span.ec)
9594

9695
self.assertEqual(db_span.n, "postgres")
9796
self.assertEqual(db_span.data["pg"]["db"], testenv['postgresql_db'])
@@ -107,14 +106,13 @@ def test_basic_insert(self):
107106
spans = self.recorder.queued_spans()
108107
self.assertEqual(2, len(spans))
109108

110-
db_span = spans[0]
111-
test_span = spans[1]
109+
db_span, test_span = spans
112110

113111
self.assertEqual("test", test_span.data["sdk"]["name"])
114112
self.assertEqual(test_span.t, db_span.t)
115113
self.assertEqual(db_span.p, test_span.s)
116114

117-
self.assertEqual(None, db_span.ec)
115+
self.assertIsNone(db_span.ec)
118116

119117
self.assertEqual(db_span.n, "postgres")
120118
self.assertEqual(db_span.data["pg"]["db"], testenv['postgresql_db'])
@@ -124,7 +122,6 @@ def test_basic_insert(self):
124122
self.assertEqual(db_span.data["pg"]["port"], testenv['postgresql_port'])
125123

126124
def test_executemany(self):
127-
result = None
128125
with tracer.start_active_span('test'):
129126
result = self.cursor.executemany("INSERT INTO users(name, email) VALUES(%s, %s)",
130127
[('beaker', '[email protected]'), ('beaker', '[email protected]')])
@@ -133,14 +130,13 @@ def test_executemany(self):
133130
spans = self.recorder.queued_spans()
134131
self.assertEqual(2, len(spans))
135132

136-
db_span = spans[0]
137-
test_span = spans[1]
133+
db_span, test_span = spans
138134

139135
self.assertEqual("test", test_span.data["sdk"]["name"])
140136
self.assertEqual(test_span.t, db_span.t)
141137
self.assertEqual(db_span.p, test_span.s)
142138

143-
self.assertEqual(None, db_span.ec)
139+
self.assertIsNone(db_span.ec)
144140

145141
self.assertEqual(db_span.n, "postgres")
146142
self.assertEqual(db_span.data["pg"]["db"], testenv['postgresql_db'])
@@ -150,23 +146,21 @@ def test_executemany(self):
150146
self.assertEqual(db_span.data["pg"]["port"], testenv['postgresql_port'])
151147

152148
def test_call_proc(self):
153-
result = None
154149
with tracer.start_active_span('test'):
155150
result = self.cursor.callproc('test_proc', ('beaker',))
156151

157-
assert(type(result) is tuple)
152+
self.assertIsInstance(result, tuple)
158153

159154
spans = self.recorder.queued_spans()
160155
self.assertEqual(2, len(spans))
161156

162-
db_span = spans[0]
163-
test_span = spans[1]
157+
db_span, test_span = spans
164158

165159
self.assertEqual("test", test_span.data["sdk"]["name"])
166160
self.assertEqual(test_span.t, db_span.t)
167161
self.assertEqual(db_span.p, test_span.s)
168162

169-
self.assertEqual(None, db_span.ec)
163+
self.assertIsNone(db_span.ec)
170164

171165
self.assertEqual(db_span.n, "postgres")
172166
self.assertEqual(db_span.data["pg"]["db"], testenv['postgresql_db'])
@@ -184,13 +178,12 @@ def test_error_capture(self):
184178
except Exception:
185179
pass
186180

187-
assert(result is None)
181+
self.assertIsNone(result)
188182

189183
spans = self.recorder.queued_spans()
190184
self.assertEqual(2, len(spans))
191185

192-
db_span = spans[0]
193-
test_span = spans[1]
186+
db_span, test_span = spans
194187

195188
self.assertEqual("test", test_span.data["sdk"]["name"])
196189
self.assertEqual(test_span.t, db_span.t)
@@ -257,8 +250,7 @@ def test_connect_cursor_ctx_mgr(self):
257250
spans = self.recorder.queued_spans()
258251
self.assertEqual(2, len(spans))
259252

260-
db_span = spans[0]
261-
test_span = spans[1]
253+
db_span, test_span = spans
262254

263255
self.assertEqual("test", test_span.data["sdk"]["name"])
264256
self.assertEqual(test_span.t, db_span.t)
@@ -282,8 +274,7 @@ def test_connect_ctx_mgr(self):
282274
spans = self.recorder.queued_spans()
283275
self.assertEqual(2, len(spans))
284276

285-
db_span = spans[0]
286-
test_span = spans[1]
277+
db_span, test_span = spans
287278

288279
self.assertEqual("test", test_span.data["sdk"]["name"])
289280
self.assertEqual(test_span.t, db_span.t)
@@ -307,8 +298,7 @@ def test_cursor_ctx_mgr(self):
307298
spans = self.recorder.queued_spans()
308299
self.assertEqual(2, len(spans))
309300

310-
db_span = spans[0]
311-
test_span = spans[1]
301+
db_span, test_span = spans
312302

313303
self.assertEqual("test", test_span.data["sdk"]["name"])
314304
self.assertEqual(test_span.t, db_span.t)

0 commit comments

Comments
 (0)