forked from pool/python-Fabric
- Update to 3.2.2 - add fix-test-deps.patch to remove vendored dependencies *[Bug]: fabric.runners.Remote failed to properly deregister its SIGWINCH signal handler on shutdown; in rare situations this could cause tracebacks when the Python process receives SIGWINCH while no remote session is active. This has been fixed. * [Bug] #2204: The signal handling functionality added in Fabric 2.6 caused unrecoverable tracebacks when invoked from inside a thread (such as the use of fabric.group.ThreadingGroup) under certain interpreter versions. This has been fixed by simply refusing to register signal handlers when not in the main thread. Thanks to Francesco Giordano and others for the reports. * [Bug]: Neglected to actually add deprecated to our runtime dependency specification (it was still in our development dependencies). This has been fixed. * [Feature]: Enhanced fabric.testing in ways large and small: Backwards-compatibly merged the functionality of MockSFTP into MockRemote (may be opted-into by instantiating the latter with enable_sftp=True) so you can mock out both SSH and SFTP functionality in the same test, which was previously impossible. It also means you can use this in a Pytest autouse fixture to prevent any tests from accidentally hitting the network! A new pytest fixture, remote_with_sftp, has been added which leverages the previous bullet point (an all-in-one fixture suitable for, eg, preventing any incidental ssh/sftp attempts during test execution). A pile of documentation and test enhancements (yes, testing our testing helpers is a thing). * [Support]: Added a new runtime dependency on the Deprecated library. * [Support]: Language update: applied s/sanity/safety/g to the codebase (with the few actual API members using the term now marked deprecated & new ones added in the meantime, mostly in fabric.testing). * [Feature]: Add a new CLI flag to fab, fab --list-agent-keys, which will attempt to connect to your local SSH agent and print a key list, similarly to ssh-add -l. This is mostly useful for expectations-checking Fabric and Paramiko’s agent OBS-URL: https://build.opensuse.org/request/show/1118865 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Fabric?expand=0&rev=86
73 lines
2.3 KiB
Diff
73 lines
2.3 KiB
Diff
Index: fabric-3.2.2/tests/conftest.py
|
|
===================================================================
|
|
--- fabric-3.2.2.orig/tests/conftest.py
|
|
+++ fabric-3.2.2/tests/conftest.py
|
|
@@ -4,15 +4,9 @@ from unittest.mock import patch
|
|
|
|
from pytest import fixture
|
|
|
|
-# Set up icecream globally for convenience.
|
|
-from icecream import install as install_icecream
|
|
-
|
|
from fabric.testing.fixtures import client, remote, sftp, sftp_objs, transfer
|
|
|
|
|
|
-install_icecream()
|
|
-
|
|
-
|
|
# TODO: does this want to end up in the public fixtures module too?
|
|
@fixture(autouse=True)
|
|
def no_user_ssh_config():
|
|
Index: fabric-3.2.2/tests/_util.py
|
|
===================================================================
|
|
--- fabric-3.2.2.orig/tests/_util.py
|
|
+++ fabric-3.2.2/tests/_util.py
|
|
@@ -3,7 +3,7 @@ import os
|
|
import re
|
|
import sys
|
|
|
|
-from invoke.vendor.lexicon import Lexicon
|
|
+from lexicon import Lexicon
|
|
from pytest_relaxed import trap
|
|
|
|
from fabric.main import make_program
|
|
Index: fabric-3.2.2/tests/auth.py
|
|
===================================================================
|
|
--- fabric-3.2.2.orig/tests/auth.py
|
|
+++ fabric-3.2.2/tests/auth.py
|
|
@@ -2,7 +2,7 @@ from getpass import getpass
|
|
from pathlib import Path
|
|
from unittest.mock import Mock, patch
|
|
|
|
-from invoke.vendor.lexicon import Lexicon
|
|
+from lexicon import Lexicon
|
|
from pytest import raises, fixture
|
|
from paramiko import (
|
|
AgentKey,
|
|
Index: fabric-3.2.2/tests/config.py
|
|
===================================================================
|
|
--- fabric-3.2.2.orig/tests/config.py
|
|
+++ fabric-3.2.2/tests/config.py
|
|
@@ -3,7 +3,7 @@ from os.path import join, expanduser
|
|
|
|
from paramiko.config import SSHConfig
|
|
from invoke import Local
|
|
-from invoke.vendor.lexicon import Lexicon
|
|
+from lexicon import Lexicon
|
|
|
|
from fabric import Config, Remote, RemoteShell
|
|
from fabric.util import get_local_user
|
|
Index: fabric-3.2.2/tests/connection.py
|
|
===================================================================
|
|
--- fabric-3.2.2.orig/tests/connection.py
|
|
+++ fabric-3.2.2/tests/connection.py
|
|
@@ -13,7 +13,7 @@ from paramiko import SSHConfig
|
|
import pytest # for mark, internal raises
|
|
from pytest import skip, param
|
|
from pytest_relaxed import raises
|
|
-from invoke.vendor.lexicon import Lexicon
|
|
+from lexicon import Lexicon
|
|
|
|
from invoke.config import Config as InvokeConfig
|
|
from invoke.exceptions import ThreadException
|