Author: Greg Price <[email protected]>
Branch:
Changeset: r62537:9560ecb7c7e5
Date: 2013-03-19 17:57 -0700
http://bitbucket.org/pypy/pypy/changeset/9560ecb7c7e5/
Log: Skip a couple of tests when no Mercurial repo present
diff --git a/pypy/doc/test/test_whatsnew.py b/pypy/doc/test/test_whatsnew.py
--- a/pypy/doc/test/test_whatsnew.py
+++ b/pypy/doc/test/test_whatsnew.py
@@ -1,6 +1,6 @@
import py
import pypy
-from commands import getoutput
+from commands import getoutput, getstatusoutput
ROOT = py.path.local(pypy.__file__).dirpath().dirpath()
@@ -20,6 +20,9 @@
return startrev, branches
def get_merged_branches(path, startrev, endrev):
+ if getstatusoutput('hg root')[0]:
+ py.test.skip('no Mercurial repo')
+
# X = take all the merges which are descendants of startrev and are on
default
# revset = all the parents of X which are not on default
# ===>
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
