backup branch

This commit is contained in:
cis-kuldeep 2021-05-27 17:45:52 +05:30
parent 26f41f76a7
commit 8c9e6c62fd
2 changed files with 11 additions and 11 deletions

View File

@ -63,12 +63,12 @@ class TestAPIShutdown(TestAPIProto, TestProcessShutdown):
class TestAPI(TestAPIProto): class TestAPI(TestAPIProto):
"""Main API test case""" """Main API test case"""
_seed = base64.encodestring( _seed = base64.b64encode(
'TIGER, tiger, burning bright. In the forests of the night' 'TIGER, tiger, burning bright. In the forests of the night'.encode('UTF-8')
) )
def _add_random_address(self, label): def _add_random_address(self, label):
return self.api.createRandomAddress(base64.encodestring(label)) return self.api.createRandomAddress(base64.b64encode(label.encode('UTF-8')))
def test_user_password(self): def test_user_password(self):
"""Trying to connect with wrong username/password""" """Trying to connect with wrong username/password"""
@ -177,7 +177,7 @@ class TestAPI(TestAPIProto):
# Add known address # Add known address
self.api.addAddressBookEntry( self.api.addAddressBookEntry(
'BM-2cWzSnwjJ7yRP3nLEWUV5LisTZyREWSzUK', 'BM-2cWzSnwjJ7yRP3nLEWUV5LisTZyREWSzUK',
base64.encodestring('tiger_4') base64.b64encode('tiger_4'.encode('UTF-8'))
) )
# Check addressbook entry # Check addressbook entry
entries = json.loads( entries = json.loads(
@ -185,7 +185,7 @@ class TestAPI(TestAPIProto):
self.assertEqual( self.assertEqual(
entries['address'], 'BM-2cWzSnwjJ7yRP3nLEWUV5LisTZyREWSzUK') entries['address'], 'BM-2cWzSnwjJ7yRP3nLEWUV5LisTZyREWSzUK')
self.assertEqual( self.assertEqual(
base64.decodestring(entries['label']), 'tiger_4') base64.decodebytes(entries['label']), 'tiger_4')
# Remove known address # Remove known address
self.api.deleteAddressBookEntry( self.api.deleteAddressBookEntry(
'BM-2cWzSnwjJ7yRP3nLEWUV5LisTZyREWSzUK') 'BM-2cWzSnwjJ7yRP3nLEWUV5LisTZyREWSzUK')
@ -201,7 +201,7 @@ class TestAPI(TestAPIProto):
# special address, added when sqlThread starts # special address, added when sqlThread starts
if s['address'] == 'BM-GtovgYdgs7qXPkoYaRgrLFuFKz1SFpsw': if s['address'] == 'BM-GtovgYdgs7qXPkoYaRgrLFuFKz1SFpsw':
self.assertEqual( self.assertEqual(
base64.decodestring(s['label']), base64.decodebytes(s['label']),
'Bitmessage new releases/announcements') 'Bitmessage new releases/announcements')
self.assertTrue(s['enabled']) self.assertTrue(s['enabled'])
break break
@ -219,8 +219,8 @@ class TestAPI(TestAPIProto):
"""Test message sending""" """Test message sending"""
# self.api.createDeterministicAddresses(self._seed, 1, 4) # self.api.createDeterministicAddresses(self._seed, 1, 4)
addr = self._add_random_address('random_2') addr = self._add_random_address('random_2')
msg = base64.encodestring('test message') msg = base64.b64encode('test message'.encode('UTF-8'))
msg_subject = base64.encodestring('test_subject') msg_subject = base64.b64encode('test_subject'.encode('UTF-8'))
ackdata = self.api.sendMessage( ackdata = self.api.sendMessage(
'BM-2cWzSnwjJ7yRP3nLEWUV5LisTZyREWSzUK', addr, msg_subject, msg) 'BM-2cWzSnwjJ7yRP3nLEWUV5LisTZyREWSzUK', addr, msg_subject, msg)
try: try:
@ -278,9 +278,9 @@ class TestAPI(TestAPIProto):
def test_send_broadcast(self): def test_send_broadcast(self):
"""Test broadcast sending""" """Test broadcast sending"""
addr = self._add_random_address('random_2') addr = self._add_random_address('random_2')
msg = base64.encodestring('test broadcast') msg = base64.b64encode('test broadcast'.encode('UTF-8'))
ackdata = self.api.sendBroadcast( ackdata = self.api.sendBroadcast(
addr, base64.encodestring('test_subject'), msg) addr, base64.b64encode('test_subject'.encode('UTF-8')), msg)
try: try:
int(ackdata, 16) int(ackdata, 16)
status = self.api.getStatus(ackdata) status = self.api.getStatus(ackdata)

View File

@ -15,7 +15,7 @@ import psutil
from .common import cleanup, put_signal_file, skip_python3 from .common import cleanup, put_signal_file, skip_python3
skip_python3() # skip_python3()
class TestProcessProto(unittest.TestCase): class TestProcessProto(unittest.TestCase):