From c0e458788a96c74b64358178f6e34bc79c1973b8 Mon Sep 17 00:00:00 2001
From: Xavier Deguillard <xavierd@fb.com>
Date: Wed, 24 Jun 2020 09:36:57 -0700
Subject: [PATCH] tests: fix the progress tests

Summary:
These were broken mostly due a test issue (using bytes instead of str), and a
small difference when printing "units_per_sec", which was an int in python2,
and was computed as a float in python3.

Reviewed By: DurhamG

Differential Revision: D22095813

fbshipit-source-id: 8af8332dad5366d2c168485b120a984ff1ba558a
---
 eden/scm/edenscm/mercurial/progress.py         |  2 +-
 eden/scm/tests/progresstest.py                 | 10 +++++-----
 eden/scm/tests/test-progress-classicrenderer.t |  1 -
 eden/scm/tests/test-progress-fancyrenderer.t   |  1 -
 eden/scm/tests/test-progressfile.t             |  1 -
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/eden/scm/edenscm/mercurial/progress.py b/eden/scm/edenscm/mercurial/progress.py
index b6a1532c1b..94dda50a15 100644
--- a/eden/scm/edenscm/mercurial/progress.py
+++ b/eden/scm/edenscm/mercurial/progress.py
@@ -124,7 +124,7 @@ def estimatespeed(bar):
     delta = endpos - startpos
     elapsed = endtime - starttime
     if elapsed > 0:
-        return delta / elapsed
+        return delta // elapsed
     return None
 
 
diff --git a/eden/scm/tests/progresstest.py b/eden/scm/tests/progresstest.py
index 2f52c3efdd..2d89620c22 100644
--- a/eden/scm/tests/progresstest.py
+++ b/eden/scm/tests/progresstest.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import
 
 import time
 
-from edenscm.mercurial import progress, registrar, util
+from edenscm.mercurial import progress, pycompat, registrar, util
 
 
 cmdtable = {}
@@ -26,9 +26,9 @@ _faketime = faketime()
 time.time = _faketime.time
 
 unicodeloopitems = [
-    u"\u3042\u3044".encode("utf-8"),  # 2 x 2 = 4 columns
-    u"\u3042\u3044\u3046".encode("utf-8"),  # 2 x 3 = 6 columns
-    u"\u3042\u3044\u3046\u3048".encode("utf-8"),  # 2 x 4 = 8 columns
+    pycompat.ensurestr(u"\u3042\u3044"),  # 2 x 2 = 4 columns
+    pycompat.ensurestr(u"\u3042\u3044\u3046"),  # 2 x 3 = 6 columns
+    pycompat.ensurestr(u"\u3042\u3044\u3046\u3048"),  # 2 x 4 = 8 columns
 ]
 
 
@@ -50,7 +50,7 @@ def progresstest(ui, loops, total, **opts):
     nested = opts.get("nested", None)
     useunicode = opts.get("unicode", False)
     if useunicode:
-        topic = u"\u3042\u3044\u3046\u3048".encode("utf-8")
+        topic = pycompat.ensurestr(u"\u3042\u3044\u3046\u3048")
     else:
         topic = "progress test"
     with progress.bar(ui, topic, "cycles", total) as prog:
diff --git a/eden/scm/tests/test-progress-classicrenderer.t b/eden/scm/tests/test-progress-classicrenderer.t
index 51b8c8c90d..952e8815fd 100644
--- a/eden/scm/tests/test-progress-classicrenderer.t
+++ b/eden/scm/tests/test-progress-classicrenderer.t
@@ -1,4 +1,3 @@
-#require py2
 #chg-compatible
 
   $ enable progress
diff --git a/eden/scm/tests/test-progress-fancyrenderer.t b/eden/scm/tests/test-progress-fancyrenderer.t
index a622b2af57..00faa8bb4b 100644
--- a/eden/scm/tests/test-progress-fancyrenderer.t
+++ b/eden/scm/tests/test-progress-fancyrenderer.t
@@ -1,4 +1,3 @@
-#require py2
 #chg-compatible
 
   $ enable progress color
diff --git a/eden/scm/tests/test-progressfile.t b/eden/scm/tests/test-progressfile.t
index acbebfc481..4d4aa2bb93 100644
--- a/eden/scm/tests/test-progressfile.t
+++ b/eden/scm/tests/test-progressfile.t
@@ -1,4 +1,3 @@
-#require py2
 #chg-compatible
 
   $ enable progress progressfile