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

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

Merge "adb: don't use parameterized in test_adb.py."

parents 4ab0bc41 3f2f3bac
Loading
Loading
Loading
Loading
+98 −88
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import time
import unittest
import warnings
from importlib import util
from parameterized import parameterized_class

def find_open_port():
    # Find an open port.
@@ -620,15 +619,10 @@ def zeroconf_register_service(zeroconf_ctx, info):
        zeroconf_ctx.unregister_service(info)

"""Should match the service names listed in adb_mdns.h"""
@parameterized_class(('service_name',), [
    ("adb",),
    ("adb-tls-connect",),
    ("adb-tls-pairing",),
])
@unittest.skipIf(not is_adb_mdns_available(), "mdns feature not available")
class MdnsTest(unittest.TestCase):
class MdnsTest:
    """Tests for adb mdns."""

    class Base(unittest.TestCase):
        @staticmethod
        def _mdns_services(port):
            output = subprocess.check_output(["adb", "-P", str(port), "mdns", "services"])
@@ -732,6 +726,22 @@ class MdnsTest(unittest.TestCase):
                        self.assertFalse(any((serv_instance in line and serv_type in line)
                            for line in MdnsTest._mdns_services(server_port)))


@unittest.skipIf(not is_adb_mdns_available(), "mdns feature not available")
class MdnsTestAdb(MdnsTest.Base):
    service_name = "adb"


@unittest.skipIf(not is_adb_mdns_available(), "mdns feature not available")
class MdnsTestAdbTlsConnect(MdnsTest.Base):
    service_name = "adb-tls-connect"


@unittest.skipIf(not is_adb_mdns_available(), "mdns feature not available")
class MdnsTestAdbTlsPairing(MdnsTest.Base):
    service_name = "adb-tls-pairing"


def main():
    """Main entrypoint."""
    random.seed(0)