From 8c9e6c62fde83d06e15c74febbf8669b4da39201 Mon Sep 17 00:00:00 2001
From: cis-kuldeep <kuldeep.k@cisinlabs.com>
Date: Thu, 27 May 2021 17:45:52 +0530
Subject: [PATCH] backup branch

---
 src/tests/test_api.py     | 20 ++++++++++----------
 src/tests/test_process.py |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/tests/test_api.py b/src/tests/test_api.py
index 188bfbaa..2c3a32d1 100644
--- a/src/tests/test_api.py
+++ b/src/tests/test_api.py
@@ -63,12 +63,12 @@ class TestAPIShutdown(TestAPIProto, TestProcessShutdown):
 
 class TestAPI(TestAPIProto):
     """Main API test case"""
-    _seed = base64.encodestring(
-        'TIGER, tiger, burning bright. In the forests of the night'
+    _seed = base64.b64encode(
+        'TIGER, tiger, burning bright. In the forests of the night'.encode('UTF-8')
     )
 
     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):
         """Trying to connect with wrong username/password"""
@@ -177,7 +177,7 @@ class TestAPI(TestAPIProto):
         # Add known address
         self.api.addAddressBookEntry(
             'BM-2cWzSnwjJ7yRP3nLEWUV5LisTZyREWSzUK',
-            base64.encodestring('tiger_4')
+            base64.b64encode('tiger_4'.encode('UTF-8'))
         )
         # Check addressbook entry
         entries = json.loads(
@@ -185,7 +185,7 @@ class TestAPI(TestAPIProto):
         self.assertEqual(
             entries['address'], 'BM-2cWzSnwjJ7yRP3nLEWUV5LisTZyREWSzUK')
         self.assertEqual(
-            base64.decodestring(entries['label']), 'tiger_4')
+            base64.decodebytes(entries['label']), 'tiger_4')
         # Remove known address
         self.api.deleteAddressBookEntry(
             'BM-2cWzSnwjJ7yRP3nLEWUV5LisTZyREWSzUK')
@@ -201,7 +201,7 @@ class TestAPI(TestAPIProto):
             # special address, added when sqlThread starts
             if s['address'] == 'BM-GtovgYdgs7qXPkoYaRgrLFuFKz1SFpsw':
                 self.assertEqual(
-                    base64.decodestring(s['label']),
+                    base64.decodebytes(s['label']),
                     'Bitmessage new releases/announcements')
                 self.assertTrue(s['enabled'])
                 break
@@ -219,8 +219,8 @@ class TestAPI(TestAPIProto):
         """Test message sending"""
         # self.api.createDeterministicAddresses(self._seed, 1, 4)
         addr = self._add_random_address('random_2')
-        msg = base64.encodestring('test message')
-        msg_subject = base64.encodestring('test_subject')
+        msg = base64.b64encode('test message'.encode('UTF-8'))
+        msg_subject = base64.b64encode('test_subject'.encode('UTF-8'))
         ackdata = self.api.sendMessage(
             'BM-2cWzSnwjJ7yRP3nLEWUV5LisTZyREWSzUK', addr, msg_subject, msg)
         try:
@@ -278,9 +278,9 @@ class TestAPI(TestAPIProto):
     def test_send_broadcast(self):
         """Test broadcast sending"""
         addr = self._add_random_address('random_2')
-        msg = base64.encodestring('test broadcast')
+        msg = base64.b64encode('test broadcast'.encode('UTF-8'))
         ackdata = self.api.sendBroadcast(
-            addr, base64.encodestring('test_subject'), msg)
+            addr, base64.b64encode('test_subject'.encode('UTF-8')), msg)
         try:
             int(ackdata, 16)
             status = self.api.getStatus(ackdata)
diff --git a/src/tests/test_process.py b/src/tests/test_process.py
index d976aa18..6e270627 100644
--- a/src/tests/test_process.py
+++ b/src/tests/test_process.py
@@ -15,7 +15,7 @@ import psutil
 from .common import cleanup, put_signal_file, skip_python3
 
 
-skip_python3()
+# skip_python3()
 
 
 class TestProcessProto(unittest.TestCase):