tests: enable passing tests in python3

Summary: These are passing, let's enable them.

Reviewed By: quark-zju, singhsrb

Differential Revision: D19676094

fbshipit-source-id: bcb363382d48a93ac62dceab2dd6349b910bb51a

eden/scm/tests/test-argspans.py

@@ -13,9 +13,6 @@ from hghave import require
 from testutil import argspans
 
 
-require(["py2"])
-
-
 try:
     import parso
 
@@ -29,9 +26,9 @@ def testfunc():
     def foo(x, y):
         filepath, lineno, indent, spans = argspans.argspans()
         assert os.path.basename(filepath) == "test-argspans.py"
-        assert lineno == 38
+        assert lineno == 35
         assert indent == 12
-        assert spans == [((38, 16), (38, 17)), ((38, 19), (38, 24))]
+        assert spans == [((35, 16), (35, 17)), ((35, 19), (35, 24))]
 
     if True:
         if True:
@@ -43,9 +40,9 @@ def testfunc():
 
         def inner2(x, y):
             filepath, lineno, indent, spans = argspans.argspans(nested=2)
-            assert lineno == 52
+            assert lineno == 49
             assert indent == 4
-            assert spans == [((52, 11), (52, 13)), ((52, 15), (52, 20))]
+            assert spans == [((49, 11), (49, 13)), ((49, 15), (49, 20))]
 
         inner1(x, y)
 
@@ -57,7 +54,7 @@ def testoperator():
         def __eq__(self, rhs):
             filepath, lineno, indent, spans = argspans.argspans()
             assert indent == 4
-            assert spans == [((62, 11), (64, 7))]
+            assert spans == [((59, 11), (61, 7))]
 
     A() == """multi
     line

eden/scm/tests/test-bundle-vs-outgoing.t

@@ -1,4 +1,3 @@
-#require py2
 #chg-compatible
 
   $ disable treemanifest

eden/scm/tests/test-check-interfaces.py

@@ -6,9 +6,6 @@ from edenscm.mercurial import bundlerepo, httppeer, localrepo, sshpeer, ui as ui
 from hghave import require
 
 
-require(["py2"])
-
-
 def checkobject(o):
     """Verify a constructed object conforms to interface rules.
 

eden/scm/tests/test-clone-r.t

@@ -1,4 +1,3 @@
-#require py2
 #chg-compatible
 
   $ disable treemanifest

eden/scm/tests/test-copytrace-heuristics.t

@@ -1,4 +1,3 @@
-#require py2
 #chg-compatible
 
   $ . helpers-usechg.sh

eden/scm/tests/test-fb-hgext-copytrace-errormsg-t.py

@@ -8,9 +8,6 @@ from __future__ import absolute_import
 from testutil.dott import feature, sh, testtmp  # noqa: F401
 
 
-feature.require(["py2"])
-
-
 # TODO: Make this test compatibile with obsstore enabled.
 sh % "setconfig 'experimental.evolution='"
 

eden/scm/tests/test-fb-hgext-copytrace.t

@@ -1,4 +1,3 @@
-#require py2
 #chg-compatible
 
   $ configure evolution

eden/scm/tests/test-fb-hgext-myparent.t

@@ -1,4 +1,3 @@
-#require py2
 #chg-compatible
 
 Setup

eden/scm/tests/test-merge-commit.t

@@ -1,4 +1,3 @@
-#require py2
 #chg-compatible
 
   $ disable treemanifest

eden/scm/tests/test-merge1.t

@@ -1,4 +1,3 @@
-#require py2
 #chg-compatible
 
   $ . helpers-usechg.sh

eden/scm/tests/test-merge6.t

@@ -1,4 +1,3 @@
-#require py2
 #chg-compatible
 
   $ disable treemanifest

eden/scm/tests/test-merge7.t

@@ -1,4 +1,3 @@
-#require py2
 #chg-compatible
 
   $ disable treemanifest

eden/scm/tests/test-mv-cp-st-diff.t

@@ -1,4 +1,3 @@
-#require py2
 #chg-compatible
 
   $ disable treemanifest

eden/scm/tests/test-revset-dirstate-parents.t

@@ -1,4 +1,3 @@
-#require py2
 #chg-compatible
 
 #chg-compatible

eden/scm/tests/test-revset-outgoing.t

@@ -1,4 +1,3 @@
-#require py2
 #chg-compatible
 
   $ disable treemanifest

eden/scm/tests/test-show.t

@@ -1,4 +1,3 @@
-#require py2
 #chg-compatible
 
 We assume that log basically works (it has its own tests). This just covers uses

eden/scm/tests/test-simple-update.t

@@ -1,4 +1,3 @@
-#require py2
 #chg-compatible
 
   $ disable treemanifest

eden/scm/tests/test-treemanifest-amend.t

@@ -1,4 +1,3 @@
-#require py2
 #chg-compatible
 
 Crash in histpack code path where the amend destination already exists

eden/scm/tests/test-uncommit.t

@@ -1,4 +1,3 @@
-#require py2
 #chg-compatible
 
 Test uncommit - set up the config

eden/scm/tests/test-unified-test.t

@@ -1,4 +1,3 @@
-#require py2
 #chg-compatible
 
 Test that the syntax of "unified tests" is properly processed