Skip to content

Commit ba608a3

Browse files
committed
Another round of tweaks
1 parent 1cad361 commit ba608a3

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

tests/test_odm2/test_odm2.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ def test_createModel(setup):
347347

348348
res = setup.odmread.getModels(codes=['converter'])
349349
assert res is not None
350-
assert res.ModelCode == 'converter'
350+
assert res[0].ModelCode == 'converter'
351351

352352
with pytest.raises(Exception) as excinfo:
353353
# create converter with duplicate code (expected: fail to insert record)
@@ -378,11 +378,11 @@ def test_createRelatedModel(setup):
378378

379379
m1r = setup.odmread.getModels(codes=['converter'])
380380
assert m1r is not None
381-
assert m1r.ModelCode == 'converter'
381+
assert m1r[0].ModelCode == 'converter'
382382

383383
m2r = setup.odmread.getModels(codes=['model2'])
384384
assert m2r is not None
385-
assert m2r.ModelCode == 'model2'
385+
assert m2r[0].ModelCode == 'model2'
386386

387387
m1rel = setup.odmread.getRelatedModels(code='converter')
388388
assert len(m1rel) == 1

tests/test_odm2/test_readservice.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,10 @@ def test_getRelatedModelsByCode(self):
186186

187187
# test invalid argument
188188
resapi = self.reader.getRelatedModels(code = 234123)
189-
assert resapi is None
189+
assert resapi is []
190+
# MySQL is very relaxed about this,
191+
# should be `resapi is None` if PostgreSQL,
192+
# because code type is not string
190193

191194

192195

0 commit comments

Comments
 (0)