D6921: tests: use silenttestrunner in test-simplemerge.py

indygreg (Gregory Szorc) phabricator at mercurial-scm.org
Mon Sep 30 08:49:51 EDT 2019


Closed by commit rHGd75142ef054a: tests: use silenttestrunner in test-simplemerge.py (authored by indygreg).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6921?vs=16694&id=16703

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6921/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6921

AFFECTED FILES
  tests/test-simplemerge.py
  tests/test-simplemerge.py.out

CHANGE DETAILS

diff --git a/tests/test-simplemerge.py.out b/tests/test-simplemerge.py.out
deleted file mode 100644
--- a/tests/test-simplemerge.py.out
+++ /dev/null
@@ -1,5 +0,0 @@
-................
-----------------------------------------------------------------------
-Ran 16 tests in 0.000s
-
-OK
diff --git a/tests/test-simplemerge.py b/tests/test-simplemerge.py
--- a/tests/test-simplemerge.py
+++ b/tests/test-simplemerge.py
@@ -355,11 +355,5 @@
                          b'>>>>>>> THIS\r'.splitlines(True), list(m_lines))
 
 if __name__ == '__main__':
-    # hide the timer
-    import time
-    orig = time.time
-    try:
-        time.time = lambda: 0
-        unittest.main()
-    finally:
-        time.time = orig
+    import silenttestrunner
+    silenttestrunner.main(__name__)



To: indygreg, #hg-reviewers, pulkit
Cc: mercurial-devel


More information about the Mercurial-devel mailing list