Allow send() to skip appending newline at the end (#35, #25)

* Allow send() to skip appending newline at the end.

* Cover skipping newline in tests.

* cleanup the send() newline, and add it as new test

paramiko_expect.py

@@ -200,10 +200,12 @@ def expect(self, re_strings='', timeout=None, output_callback=None, default_matc
             # measure, let's send back a -1
             return -1
 
-    def send(self, send_string):
+    def send(self, send_string, newline=None):
         """Saves and sends the send string provided."""
         self.current_send_string = send_string
-        self.channel.send(send_string + self.newline)
+        newline = newline if newline is not None else self.newline
+
+        self.channel.send(send_string + newline)
 
     def tail(self, line_prefix=None, callback=None, output_callback=None, stop_callback=lambda x: False, timeout=None):
         """

test/test_paramiko_expect.py

@@ -207,3 +207,19 @@ def test_07_close(interact):
         channel_mock.close.side_effect = [ socket.timeout ]
         interact.close()
 
+def test_08_issue_25_skip_newline():
+    client = paramiko.SSHClient()
+    client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+    client.connect(hostname="localhost", username="root", port=2222, key_filename='./test/id_rsa')
+    with SSHClientInteraction(client, timeout=10, display=True) as interact:
+        interact.send('ls -all')
+        interact.expect(prompt, timeout=5)
+
+        # Do not actually sleep, send a ctrl-c at the end
+        interact.send('sleep 1', newline=chr(3))
+        interact.expect(prompt, timeout=5)
+        interact.send('sleep 1' + chr(3), newline='')
+        interact.expect(prompt, timeout=5)
+
+        interact.send('ls -all')
+        interact.expect(prompt, timeout=5)