Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4ad6b6a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I722d2c41,Ic216ddef 

* changes:
  Improve test_adb.py
  adb: Distinguish betwen already-connected and connection failure
parents 224d965b 8b67c520

adb/test_adb.py

+66 −31
Original line number Diff line number Diff line
@@ -21,9 +21,11 @@ things. Most of these tests involve specific error messages or the help text. 
"""

from __future__ import print_function



import binascii

import contextlib

import os

import random

import select

import socket

import struct

import subprocess
@@ -33,6 +35,52 @@ import unittest 
import adb





@contextlib.contextmanager

def fake_adb_server(protocol=socket.AF_INET, port=0):

    """Creates a fake ADB server that just replies with a CNXN packet."""



    serversock = socket.socket(protocol, socket.SOCK_STREAM)

    if protocol == socket.AF_INET:

        serversock.bind(('127.0.0.1', port))

    else:

        serversock.bind(('::1', port))

    serversock.listen(1)



    # A pipe that is used to signal the thread that it should terminate.

    readpipe, writepipe = os.pipe()



    def _handle():

        rlist = [readpipe, serversock]

        while True:

            ready, _, _ = select.select(rlist, [], [])

            for r in ready:

                if r == readpipe:

                    # Closure pipe

                    os.close(r)

                    serversock.shutdown(socket.SHUT_RDWR)

                    serversock.close()

                    return

                elif r == serversock:

                    # Server socket

                    conn, _ = r.accept()

                    rlist.append(conn)

                else:

                    # Client socket

                    data = r.recv(1024)

                    if not data:

                        rlist.remove(r)



    port = serversock.getsockname()[1]

    server_thread = threading.Thread(target=_handle)

    server_thread.start()



    try:

        yield port

    finally:

        os.close(writepipe)

        server_thread.join()





class NonApiTest(unittest.TestCase):

    """Tests for ADB that aren't a part of the AndroidDevice API."""
@@ -211,33 +259,20 @@ class NonApiTest(unittest.TestCase): 


        Bug: http://b/30313466

        """

        ipv4 = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

        ipv4.bind(('127.0.0.1', 0))

        ipv4.listen(1)



        ipv6 = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)

        for protocol in (socket.AF_INET, socket.AF_INET6):

            try:

            ipv6.bind(('::1', ipv4.getsockname()[1] + 1))

            ipv6.listen(1)

        except socket.error:

            print("IPv6 not available, skipping")

            return



        for s in (ipv4, ipv6):

            port = s.getsockname()[1]

                with fake_adb_server(protocol=protocol) as port:

                    output = subprocess.check_output(

                        ['adb', 'connect', 'localhost:{}'.format(port)])



                    self.assertEqual(

                        output.strip(), 'connected to localhost:{}'.format(port))

            s.close()

            except socket.error:

                print("IPv6 not available, skipping")

                continue



    def test_already_connected(self):

        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

        s.bind(('127.0.0.1', 0))

        s.listen(2)



        port = s.getsockname()[1]

        with fake_adb_server() as port:

            output = subprocess.check_output(

                ['adb', 'connect', 'localhost:{}'.format(port)])

adb/transport.cpp

+2 −2
Original line number Diff line number Diff line
@@ -974,7 +974,7 @@ int register_socket_transport(int s, const char* serial, int port, int local) { 
            VLOG(TRANSPORT) << "socket transport " << transport->serial

                            << " is already in pending_list and fails to register";

            delete t;

            return -1;

            return -EALREADY;

        }

    }
@@ -983,7 +983,7 @@ int register_socket_transport(int s, const char* serial, int port, int local) { 
            VLOG(TRANSPORT) << "socket transport " << transport->serial

                            << " is already in transport_list and fails to register";

            delete t;

            return -1;

            return -EALREADY;

        }

    }

adb/transport_local.cpp

+5 −1
Original line number Diff line number Diff line
@@ -101,7 +101,11 @@ void connect_device(const std::string& address, std::string* response) { 
    int ret = register_socket_transport(fd, serial.c_str(), port, 0);

    if (ret < 0) {

        adb_close(fd);

        if (ret == -EALREADY) {

            *response = android::base::StringPrintf("already connected to %s", serial.c_str());

        } else {

            *response = android::base::StringPrintf("failed to connect to %s", serial.c_str());

        }

    } else {

        *response = android::base::StringPrintf("connected to %s", serial.c_str());

    }