Skip to content

Commit 9c2b36f

Browse files
author
Dan
committed
Renamed fake_server to embedded_server now it is actually running shell commands
1 parent 94949a8 commit 9c2b36f

File tree

8 files changed

+9
-8
lines changed

8 files changed

+9
-8
lines changed
File renamed without changes.

fake_server/fake_server.py renamed to embedded_server/embedded_server.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
from tunnel import Tunneler
4242
import gevent.subprocess
4343

44-
logger = logging.getLogger("fake_server")
44+
logger = logging.getLogger("embedded_server")
4545
paramiko_logger = logging.getLogger('paramiko.transport')
4646

4747
host_key = paramiko.RSAKey(filename = os.path.sep.join([os.path.dirname(__file__), 'rsa.key']))
@@ -128,10 +128,11 @@ def make_socket(listen_ip, port=0):
128128

129129
def listen(sock, fail_auth=False, ssh_exception=False,
130130
timeout=None):
131-
"""Run a fake ssh server and given a cmd_to_run, send given \
132-
response to client connection. Returns (server, socket) tuple \
133-
where server is a joinable server thread and socket is listening \
134-
socket of server."""
131+
"""Run server and given a cmd_to_run, send given
132+
response to client connection. Returns (server, socket) tuple
133+
where server is a joinable server thread and socket is listening
134+
socket of server.
135+
"""
135136
listen_ip, listen_port = sock.getsockname()
136137
if not sock:
137138
logger.error("Could not establish listening connection on %s:%s", listen_ip, listen_port)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

tests/test_pssh_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import unittest
2323
from pssh import ParallelSSHClient, UnknownHostException, \
2424
AuthenticationException, ConnectionErrorException, SSHException, logger as pssh_logger
25-
from fake_server.fake_server import start_server, make_socket, \
25+
from embedded_server.embedded_server import start_server, make_socket, \
2626
logger as server_logger, paramiko_logger
2727
import random
2828
import logging

tests/test_ssh_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import unittest
2727
from pssh import SSHClient, ParallelSSHClient, UnknownHostException, AuthenticationException,\
2828
logger, ConnectionErrorException, UnknownHostException, SSHException
29-
from fake_server.fake_server import start_server, make_socket, logger as server_logger, \
29+
from embedded_server.embedded_server import start_server, make_socket, logger as server_logger, \
3030
paramiko_logger
31-
from fake_server.fake_agent import FakeAgent
31+
from embedded_server.fake_agent import FakeAgent
3232
import paramiko
3333
import os
3434
from test_pssh_client import USER_KEY

0 commit comments

Comments
 (0)