Skip to content

Commit eebe812

Browse files
tglmantglman
committed
fix:minor fixes and test fixes after rebase
1 parent ba9eb2c commit eebe812

File tree

9 files changed

+44
-56
lines changed

9 files changed

+44
-56
lines changed

‎pyorient/messages/base.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -201,15 +201,15 @@ def _decode_header(self):
201201
# REQUEST_PUSH_DISTRIB_CONFIG 80
202202
# REQUEST_PUSH_LIVE_QUERY 81
203203
if op_code == 80:
204+
message = self._decode_field( FIELD_STRING );
204205
# for node in
205-
payload = self.get_serializer().decode(
206-
self._decode_field( FIELD_STRING )
207-
) # JSON WITH THE NEW CLUSTER CFG
206+
# RECORD WITH THE NEW CLUSTER CFG
207+
# payload = self.get_serializer().decode( message )
208208

209209
# reset the nodelist
210210
self._node_list = []
211-
for node in payload['members']:
212-
self._node_list.append( OrientNode( node ) )
211+
# for node in payload['members']:
212+
# self._node_list.append( OrientNode( node ) )
213213

214214
end_flag = self._decode_field( FIELD_BYTE )
215215

‎tests/test_Factory_and_usage.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ def test_hi_level_transaction(self):
155155
.send().fetch_response()
156156

157157
delete_msg = ( factory.get_message(pyorient.RECORD_DELETE) )
158-
delete_msg.prepare( ( 9, rec_position._rid ) )
158+
delete_msg.prepare( ( rec_position._rid ) )
159159

160160

161161
tx = ( factory.get_message(pyorient.TX_COMMIT) )
@@ -171,10 +171,10 @@ def test_hi_level_transaction(self):
171171
print(k + " -> " + v.vacanza)
172172

173173
assert len(res) == 4
174-
assert res["#3:0"].vacanza == 'montagna'
175-
assert res["#3:2"].vacanza == 'mare'
176-
assert res["#3:3"].vacanza == 'mare'
177-
assert res["#3:4"].vacanza == 'lago'
174+
assert res["#10:0"].vacanza == 'montagna'
175+
assert res["#10:2"].vacanza == 'lago'
176+
assert res["#10:3"].vacanza == 'mare'
177+
assert res["#10:4"].vacanza == 'mare'
178178

179179
sid = ( factory.get_message(pyorient.CONNECT) ).prepare( ("root", "root") )\
180180
.send().fetch_response()
@@ -237,7 +237,7 @@ def test_command(self):
237237
rec4 = ins_msg4.send().fetch_response()
238238

239239
rec1 = rec1[0]
240-
upd_res = upd_msg5.prepare( ( rec1._rid, rec1._rid, { 'Band': 'Metallica', 'Song': 'One' } ) )\
240+
upd_res = upd_msg5.prepare( ( rec1._rid, { 'Band': 'Metallica', 'Song': 'One' } ) )\
241241
.send().fetch_response()
242242

243243
res = req_msg.prepare( [ pyorient.QUERY_SYNC, "select from c_test" ] ).send().fetch_response()
@@ -274,7 +274,7 @@ def test_command(self):
274274

275275
rec = { '@c_test': { 'alloggio': 'albergo', 'lavoro': 'ufficio', 'vacanza': 'montagna' } }
276276
update_success = ( factory.get_message(pyorient.RECORD_UPDATE) )\
277-
.prepare( ( rec_position._rid, rec_position._rid, rec ) )\
277+
.prepare( ( rec_position._rid, rec ) )\
278278
.send().fetch_response()
279279

280280

‎tests/test_new_Iface.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ def test_transaction_new_iface(self):
189189

190190
# prepare for an update
191191
rec3 = {'@v': { 'alloggio': 'albergo', 'lavoro': 'ufficio', 'vacanza': 'montagna' } }
192-
update_success = client.record_update(-1, rec_position._rid, rec3,
192+
update_success = client.record_update(rec_position._rid, rec3,
193193
rec_position._version )
194194

195195
# prepare transaction
@@ -213,9 +213,9 @@ def test_transaction_new_iface(self):
213213
print(k + " -> " + v.vacanza)
214214

215215
assert len(res) == 3
216-
assert res["#3:1"].vacanza == 'mare'
217-
assert res["#3:2"].vacanza == 'mare'
218-
assert res["#3:3"].vacanza == 'lago'
216+
assert res["#10:1"].vacanza == 'lago'
217+
assert res["#10:2"].vacanza == 'mare'
218+
assert res["#10:3"].vacanza == 'mare'
219219

220220
client.connect( "root", "root" )
221221
client.db_drop( db_name, pyorient.STORAGE_TYPE_MEMORY )

‎tests/test_ogm.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -789,11 +789,11 @@ def testCustomFields(self):
789789
g.clear_registry()
790790
g.include(database_registry)
791791
self.assertEquals(
792-
{'test_field_1': 'test_string_one', 'test_field_2': '"test string two"'},
792+
{'test_field_1': 'test_string_one', 'test_field_2': 'test string two'},
793793
g.registry['classfieldvertex'].class_fields)
794794
self.assertEquals({}, g.registry['classfieldvertex2'].class_fields)
795795
self.assertEquals(
796-
{'test_field_1': '"test string two"'},
796+
{'test_field_1': 'test string two'},
797797
g.registry['classfieldedge'].class_fields)
798798

799799

‎tests/test_raw_messages_2.py‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ def test_record_create_update(self):
170170

171171
rec = { '@my_class': { 'alloggio': 'albergo', 'lavoro': 'ufficio', 'vacanza': 'montagna' } }
172172
update_success = ( RecordUpdateMessage(connection) )\
173-
.prepare( ( cluster, rec_position._rid, rec ) )\
173+
.prepare( ( rec_position._rid, rec ) )\
174174
.send().fetch_response()
175175

176176
assert update_success[0] != 0
@@ -194,8 +194,8 @@ def test_record_create_update(self):
194194
print("%r" % res[0].lavoro)
195195
print("%r" % res[0].vacanza)
196196

197-
assert res[0]._rid == '#11:0'
198-
# assert res[0]._class == 'my_class'
197+
assert res[0]._rid == '#12:0'
198+
# assert res[0]._class == 'my_class'
199199
assert res[0]._version >= 0
200200
assert res[0].alloggio == 'albergo'
201201
assert res[0].lavoro == 'ufficio'
@@ -249,7 +249,7 @@ def test_record_delete(self):
249249

250250
rec = { "@v":{ 'alloggio': 'casa', 'lavoro': 'ufficio', 'vacanza': 'mare' }}
251251
rec_position = ( RecordCreateMessage(connection) )\
252-
.prepare( ( 1, rec ) )\
252+
.prepare( ( -1, rec ) )\
253253
.send().fetch_response()
254254

255255
print("New Rec Position: %s" % rec_position._rid)
@@ -261,8 +261,7 @@ def test_record_delete(self):
261261
.send().fetch_response()
262262

263263
import re
264-
assert re.match( '#1:[0-9]', res[0]._rid )
265-
assert res[0]._class is None
264+
assert re.match( '#10:[0-9]', res[0]._rid )
266265
assert res[0]._version >= 0
267266
assert res[0].alloggio == 'casa'
268267
assert res[0].lavoro == 'ufficio'
@@ -271,9 +270,9 @@ def test_record_delete(self):
271270
######################## Delete Rid
272271

273272
del_msg = (RecordDeleteMessage(connection))
274-
deletion = del_msg.prepare( ( 1, rec_position._rid ) )\
273+
deletion = del_msg.prepare( ( rec_position._rid ) )\
275274
.send().fetch_response()
276-
275+
277276
assert deletion is True
278277

279278
# now try a failure in deletion for wrong rid

‎tests/test_raw_messages_3.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def test_transaction(self):
130130
# prepare for an update
131131
rec3 = { '@v': { 'alloggio': 'ciao', 'lavoro': 'ciao2', 'vacanza': 'ciao3' } }
132132
temp_update_real_rec = ( RecordUpdateMessage(connection) )\
133-
.prepare( ( -1, real_record1._rid, rec3, real_record1._version ) )
133+
.prepare( ( real_record1._rid, rec3, real_record1._version ) )
134134

135135
# prepare transaction
136136
rec1 = { '@v': { 'alloggio': 'casa', 'lavoro': 'ufficio', 'vacanza': 'mare' } }
@@ -163,8 +163,8 @@ def test_transaction(self):
163163
print(k + " -> " + v.vacanza)
164164

165165
assert len(res) == 2
166-
assert res["#3:2"].vacanza == 'mare'
167-
assert res["#3:3"].vacanza == 'lago'
166+
assert res["#10:2"].vacanza == 'lago'
167+
assert res["#10:3"].vacanza == 'mare'
168168

169169
sid = ( ConnectMessage( connection ) ).prepare( ("root", "root") )\
170170
.send().fetch_response()

‎tests/test_record_contents.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ def test_record_create_nonstrings( self ):
5858

5959
def test_record_create_embedded_list( self ):
6060
# this should succeed with no exception
61-
self.client.record_create(self.class_id1, {'@my_v_class': {'a': ['bar', 'bar']}} )
61+
self.client.record_create(-1, {'@my_v_class': {'a': ['bar', 'bar']}} )
6262

6363
def test_record_create_embedded_dictionary( self ):
6464
# this should succeed with no exception
65-
self.client.record_create(self.class_id1, {'@my_v_class': {'a': [{'bar': 'bar'}]}} )
65+
self.client.record_create(-1, {'@my_v_class': {'a': [{'bar': 'bar'}]}} )
6666

6767
def test_new_orient_dict( self ):
6868
import re

‎tests/test_reserved_words_batch.py‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,6 @@ def test_reserved_words(self):
5959

6060
result = self.client.query(
6161
"select @rid, @version, holiday from V")
62-
# for x in result:
63-
# print ( "%r" % x._rid.get() )
64-
# print ( "%r" % x._rid.get_hash() )
65-
# print ( "%r" % x.holiday )
66-
# print ( "%r" % x._version )
6762

6863
assert result[0].oRecordData['rid'].get() == '12:0'
6964
assert result[0].rid.get_hash() == rec_position1._rid
@@ -98,9 +93,9 @@ def test_reserved_words(self):
9893
except AttributeError:
9994
assert True
10095

101-
assert x[0].rid2.get_hash() == '#9:0', ("Failed to assert that "
96+
assert x[0].rid2.get_hash() == '#10:0', ("Failed to assert that "
10297
"'#10:0' equals received "
103-
"value: '%s'" % x[0]._rid2)
98+
"value: '%s'" % x[0].rid2)
10499
assert x[0].model == '1123'
105100
assert x[0].ciao == 1234
106101

‎tests/test_serializations.py‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -69,50 +69,44 @@ def test_csv_escape(self):
6969
cluster_id = DB.command( "CREATE CLASS MyModel EXTENDS V" )[0]
7070

7171
data0 = {'key': '"""'}
72-
DB.record_create( -1, {'@MyModel': data0} )
72+
rid0 = DB.record_create( -1, {'@MyModel': data0} )._rid
7373

7474
data1 = {'key': "'''"}
75-
DB.record_create( -1, {'@MyModel': data1} )
75+
rid1 = DB.record_create( -1, {'@MyModel': data1} )._rid
7676

7777
data2 = {'key': '\\'}
78-
DB.record_create( -1, {'@MyModel': data2} )
78+
rid2 = DB.record_create( -1, {'@MyModel': data2} )._rid
7979

8080
data3 = {'key': '\0'}
81-
DB.record_create( -1, {'@MyModel': data3} )
81+
rid3 = DB.record_create( -1, {'@MyModel': data3} )._rid
8282

8383
data4 = {'key': '""'}
84-
DB.record_create( -1, {'@MyModel': data4} )
84+
rid4 = DB.record_create( -1, {'@MyModel': data4} )._rid
8585

8686
data5 = {'key': '\'\'""\0 \\ execution'}
87-
DB.record_create( -1, {'@MyModel': data5} )
87+
rid5 = DB.record_create( -1, {'@MyModel': data5} )._rid
8888

89-
import sys
90-
if sys.version_info[0] >= 3 and isinstance( cluster_id, bytes ):
91-
_n_rid = cluster_id.decode()
92-
else:
93-
_n_rid = str(cluster_id)
94-
95-
rec0 = DB.record_load( "#" + _n_rid + ":0" )
89+
rec0 = DB.record_load( rid0 )
9690
# assert rec0._class == "MyModel"
9791
assert rec0.oRecordData == data0
9892

99-
rec1 = DB.record_load( "#" + _n_rid + ":1" )
93+
rec1 = DB.record_load( rid1)
10094
# assert rec1._class == "MyModel"
10195
assert rec1.oRecordData == data1
10296

103-
rec2 = DB.record_load( "#" + _n_rid + ":2")
97+
rec2 = DB.record_load( rid2)
10498
# assert rec2._class == "MyModel"
10599
assert rec2.oRecordData == data2
106100

107-
rec3 = DB.record_load( "#" + _n_rid + ":3" )
101+
rec3 = DB.record_load( rid3)
108102
# assert rec3._class == "MyModel"
109103
assert rec3.oRecordData == data3
110104

111-
rec4 = DB.record_load( "#" + _n_rid + ":4" )
105+
rec4 = DB.record_load( rid4)
112106
# assert rec4._class == "MyModel"
113107
assert rec4.oRecordData == data4
114108

115-
rec5 = DB.record_load( "#" + _n_rid + ":5" )
109+
rec5 = DB.record_load(rid5)
116110
# assert rec5._class == "MyModel"
117111
assert rec5.oRecordData == data5
118112

0 commit comments

Comments
 (0)