forked from pool/python-sh
e5b6917c11
* always-use-fully-versioned-python-command-in-tests.patch * no-coverage.patch * 0001-Fix-tests-for-the-drop-the-unversion-python.patch * pep-0538-test-fix.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sh?expand=0&rev=18
62 lines
1.7 KiB
Diff
62 lines
1.7 KiB
Diff
diff -Naurp sh-1.12.14.orig/sh.py sh-1.12.14/sh.py
|
|
--- sh-1.12.14.orig/sh.py 2017-06-06 21:51:42.000000000 -0500
|
|
+++ sh-1.12.14/sh.py 2017-06-07 08:49:59.350791975 -0500
|
|
@@ -3519,14 +3519,9 @@ if __name__ == "__main__": # pragma: no
|
|
|
|
if action in ("test", "travis"):
|
|
import test
|
|
- coverage = None
|
|
- if test.HAS_UNICODE_LITERAL:
|
|
- import coverage
|
|
|
|
env = os.environ.copy()
|
|
env["SH_TESTS_RUNNING"] = "1"
|
|
- if coverage:
|
|
- test.append_module_path(env, coverage)
|
|
|
|
# if we're testing locally, run all versions of python on the system
|
|
if action == "test":
|
|
diff -Naurp sh-1.12.14.orig/test.py sh-1.12.14/test.py
|
|
--- sh-1.12.14.orig/test.py 2017-06-06 21:51:42.000000000 -0500
|
|
+++ sh-1.12.14/test.py 2017-06-07 08:49:59.351791993 -0500
|
|
@@ -6,31 +6,6 @@ IS_PY3 = sys.version_info[0] == 3
|
|
IS_PY2 = not IS_PY3
|
|
MINOR_VER = sys.version_info[1]
|
|
|
|
-# coverage doesn't work in python 3.1, 3.2 due to it just being a shit
|
|
-# python
|
|
-HAS_UNICODE_LITERAL = not (IS_PY3 and MINOR_VER in (1, 2))
|
|
-
|
|
-cov = None
|
|
-if HAS_UNICODE_LITERAL:
|
|
- run_idx = int(os.environ.pop("SH_TEST_RUN_IDX", "0"))
|
|
- first_run = run_idx == 0
|
|
-
|
|
- import coverage
|
|
-
|
|
- # for some reason, we can't run auto_data on the first run, or the coverage
|
|
- # numbers get really screwed up
|
|
- auto_data = True
|
|
- if first_run:
|
|
- auto_data = False
|
|
-
|
|
- cov = coverage.Coverage(auto_data=auto_data)
|
|
-
|
|
- if first_run:
|
|
- cov.erase()
|
|
-
|
|
- cov.start()
|
|
-
|
|
-
|
|
from os.path import exists, join, realpath, dirname, split
|
|
import unittest
|
|
try:
|
|
@@ -3045,6 +3020,4 @@ if __name__ == "__main__":
|
|
exit(1)
|
|
|
|
finally:
|
|
- if cov:
|
|
- cov.stop()
|
|
- cov.save()
|
|
+ pass
|