Skip to content

Commit f2a97b9

Browse files
Fix: replace Python 2 long with int in StatsWaitTask._compare for Python 3 compatibility
Change-Id: Idb9769d1bcbe9b7f0bbab9e9140bfc9245cb55c2 Reviewed-on: https://review.couchbase.org/c/TAF/+/244756 Tested-by: Build Bot <build@couchbase.com> Reviewed-by: <vishal.jain@couchbase.com>
1 parent baa7562 commit f2a97b9

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

lib/Jython_tasks/task.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3582,9 +3582,9 @@ def _get_checkpoint_stats_and_compare(self):
35823582
self.stop = True
35833583

35843584
def _compare(self, cmp_type, a, b):
3585-
if isinstance(b, (int, long)) and a.isdigit():
3586-
a = long(a)
3587-
elif isinstance(b, (int, long)) and not a.isdigit():
3585+
if isinstance(b, int) and a.isdigit():
3586+
a = int(a)
3587+
elif isinstance(b, int) and not a.isdigit():
35883588
return False
35893589
self.test_log.debug("Comparing %s %s %s" % (a, cmp_type, b))
35903590
if (cmp_type == StatsWaitTask.EQUAL and a == b) or \

pytests/rebalance_new/auto_retry_failed_rebalance.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ def async_data_load(self):
8282
mutation_num=0,
8383
async_load=True,
8484
batch_size=self.batch_size,
85-
process_concurrency=self.process_concurrency)
85+
process_concurrency=self.process_concurrency,
86+
load_using=self.load_docs_using)
8687
return [tasks, cont_load_task]
8788

8889
def data_validation(self, tasks):

0 commit comments

Comments
 (0)