5efd7542fe
* regression fix if `_fg=False` [#520](https://github.com/amoffat/sh/issues/520) * minor Travis CI fixes [#492](https://github.com/amoffat/sh/pull/492) * bugfix for boolean long options not respecting `_long_prefix` [#488](https://github.com/amoffat/sh/pull/488) * fix deprecation warning on Python 3.6 regexes [#482](https://github.com/amoffat/sh/pull/482) * `_pass_fds` and `_close_fds` special kwargs for controlling file descriptor inheritance in child. * more efficiently closing inherited fds [#406](https://github.com/amoffat/sh/issues/406) * bugfix where passing invalid dictionary to `_env` will cause a mysterious child 255 exit code. [#497](https://github.com/amoffat/sh/pull/497) * bugfix where `_in` using 0 or `sys.stdin` wasn't behaving like a TTY, if it was in fact a TTY. [#514](https://github.com/amoffat/sh/issues/514) * bugfix where `help(sh)` raised an exception [#455](https://github.com/amoffat/sh/issues/455) * bugfix fixing broken interactive ssh tutorial from docs * change to automatic tty merging into a single pty if `_tty_in=True` and `_tty_out=True` * introducing `_unify_ttys`, default False, which allows explicit tty merging into single pty * contrib command for `ssh` connections requiring passwords * performance fix for polling output too fast when using `_iter` [#462](https://github.com/amoffat/sh/issues/462) * execution contexts can now be used in python shell [#466](https://github.com/amoffat/sh/pull/466) * bugfix `ErrorReturnCode` instances can now be pickled * bugfix passing empty string or `None` for `_in` hanged [#427](https://github.com/amoffat/sh/pull/427) * bugfix where passing a filename or file-like object to `_out` wasn't using os.dup2 [#449](https://github.com/amoffat/sh/issues/449) * regression make `_fg` work with `_cwd` again [#330](https://github.com/amoffat/sh/issues/330) * an invalid `_cwd` now raises a `ForkException` not an `OSError`. * AIX support [#477](https://github.com/amoffat/sh/issues/477) * added a `timeout=None` param to `RunningCommand.wait()` [#515](https://github.com/amoffat/sh/issues/515) - Re-enable tests. - Refresh no-coverage.patch, fix-test_general_signal.diff and fix-test_signal_group.diff - Add fix-sleep-path-in-test.patch to fix a test failure. - Drop no longer required patches, 0001-Fix-tests-for-the-drop-the-unversion-python.patch, always-use-fully-versioned-python-command-in-tests.patch and pep-0538-test-fix.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sh?expand=0&rev=24
67 lines
1.8 KiB
Diff
67 lines
1.8 KiB
Diff
Index: sh-1.13.1/sh.py
|
|
===================================================================
|
|
--- sh-1.13.1.orig/sh.py
|
|
+++ sh-1.13.1/sh.py
|
|
@@ -3785,14 +3785,9 @@ if __name__ == "__main__": # pragma: no
|
|
|
|
if action in ("test", "travis", "tox"):
|
|
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":
|
|
Index: sh-1.13.1/test.py
|
|
===================================================================
|
|
--- sh-1.13.1.orig/test.py
|
|
+++ sh-1.13.1/test.py
|
|
@@ -6,34 +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
|
|
-
|
|
- try:
|
|
- import coverage
|
|
- except ImportError:
|
|
- pass
|
|
- else:
|
|
- # 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:
|
|
@@ -3230,6 +3202,4 @@ if __name__ == "__main__":
|
|
exit(1)
|
|
|
|
finally:
|
|
- if cov:
|
|
- cov.stop()
|
|
- cov.save()
|
|
+ pass
|