multiple: set attr.s(cmp=False)

We don't need the compare functionality of attrs. Disable it to fall back to object id hashes. Fixes #106 Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Emantor · Jul 18, 2017 · 824a6ab · 824a6ab
1 parent 60538b6
commit 824a6ab
Show file tree

Hide file tree

Showing 29 changed files with 47 additions and 47 deletions.
diff --git a/labgrid/binding.py b/labgrid/binding.py
@@ -22,7 +22,7 @@ class BindingState(enum.Enum):
     active = 2
 
 
-@attr.s
+@attr.s(cmp=False)
 class BindingMixin:
     """
     Handles the binding and activation of drivers and their supplying resources

diff --git a/labgrid/driver/bareboxdriver.py b/labgrid/driver/bareboxdriver.py
@@ -17,7 +17,7 @@
 
 
 @target_factory.reg_driver
-@attr.s
+@attr.s(cmp=False)
 class BareboxDriver(CommandMixin, Driver, CommandProtocol, LinuxBootProtocol):
     """BareboxDriver - Driver to control barebox via the console.
        BareboxDriver binds on top of a ConsoleProtocol.

diff --git a/labgrid/driver/common.py b/labgrid/driver/common.py
@@ -5,7 +5,7 @@
 from .exception import ExecutionError
 
 
-@attr.s
+@attr.s(cmp=False)
 class Driver(BindingMixin):
     """
     Represents a driver which is used externally or by other drivers. It

diff --git a/labgrid/driver/externalconsoledriver.py b/labgrid/driver/externalconsoledriver.py
@@ -15,7 +15,7 @@
 
 
 @target_factory.reg_driver
-@attr.s
+@attr.s(cmp=False)
 class ExternalConsoleDriver(ConsoleExpectMixin, Driver, ConsoleProtocol):
     """
     Driver implementing the ConsoleProtocol interface using a subprocess

diff --git a/labgrid/driver/fake.py b/labgrid/driver/fake.py
@@ -10,7 +10,7 @@
 
 
 @target_factory.reg_driver
-@attr.s
+@attr.s(cmp=False)
 class FakeConsoleDriver(ConsoleExpectMixin, Driver, ConsoleProtocol):
     txdelay = attr.ib(default=0.0, validator=attr.validators.instance_of(float))
 
@@ -32,7 +32,7 @@ def close(self):
 
 
 @target_factory.reg_driver
-@attr.s
+@attr.s(cmp=False)
 class FakeCommandDriver(CommandMixin, Driver, CommandProtocol):
     @Driver.check_active
     def run(self, *args):
@@ -48,7 +48,7 @@ def get_status(self):
 
 
 @target_factory.reg_driver
-@attr.s
+@attr.s(cmp=False)
 class FakeFileTransferDriver(Driver, FileTransferProtocol):
     @Driver.check_active
     def get(self, *args):
@@ -59,7 +59,7 @@ def put(self, *args):
         pass
 
 @target_factory.reg_driver
-@attr.s
+@attr.s(cmp=False)
 class FakePowerDriver(Driver, PowerProtocol):
     @Driver.check_active
     def on(self, *args):

diff --git a/labgrid/driver/fastbootdriver.py b/labgrid/driver/fastbootdriver.py
@@ -12,7 +12,7 @@
 
 
 @target_factory.reg_driver
-@attr.s
+@attr.s(cmp=False)
 class AndroidFastbootDriver(Driver):
     bindings = {
         "fastboot": {AndroidFastboot, NetworkAndroidFastboot},

diff --git a/labgrid/driver/infodriver.py b/labgrid/driver/infodriver.py
@@ -9,7 +9,7 @@
 from .common import Driver
 
 @target_factory.reg_driver
-@attr.s
+@attr.s(cmp=False)
 class InfoDriver(Driver, InfoProtocol):
     """
     InfoDriver implementing the InfoProtocol on top of CommandProtocol drivers

diff --git a/labgrid/driver/onewiredriver.py b/labgrid/driver/onewiredriver.py
@@ -8,7 +8,7 @@
 from .common import Driver
 
 @target_factory.reg_driver
-@attr.s
+@attr.s(cmp=False)
 class OneWirePIODriver(Driver, DigitalOutputProtocol):
 
     bindings = {"port": OneWirePIO, }

diff --git a/labgrid/driver/openocddriver.py b/labgrid/driver/openocddriver.py
@@ -13,7 +13,7 @@
 
 
 @target_factory.reg_driver
-@attr.s
+@attr.s(cmp=False)
 class OpenOCDDriver(Driver, BootstrapProtocol):
     bindings = {
         "interface": {AlteraUSBBlaster, NetworkAlteraUSBBlaster},

diff --git a/labgrid/driver/powerdriver.py b/labgrid/driver/powerdriver.py
@@ -14,7 +14,7 @@
 
 
 @target_factory.reg_driver
-@attr.s
+@attr.s(cmp=False)
 class ManualPowerDriver(Driver, PowerProtocol):
     """ManualPowerDriver - Driver to tell the user to control a target's power"""
     name = attr.ib(validator=attr.validators.instance_of(str))
@@ -43,7 +43,7 @@ def cycle(self):
 
 
 @target_factory.reg_driver
-@attr.s
+@attr.s(cmp=False)
 class ExternalPowerDriver(Driver, PowerProtocol):
     """ExternalPowerDriver - Driver using an external command to control a target's power"""
     cmd_on = attr.ib(validator=attr.validators.instance_of(str))
@@ -78,7 +78,7 @@ def cycle(self):
             self.on()
 
 @target_factory.reg_driver
-@attr.s
+@attr.s(cmp=False)
 class NetworkPowerDriver(Driver, PowerProtocol):
     """NetworkPowerDriver - Driver using a networked power switch to control a target's power"""
     bindings = {"port": NetworkPowerPort, }
@@ -115,7 +115,7 @@ def get(self):
         return self.backend.get(self.port.host, self.port.index)
 
 @target_factory.reg_driver
-@attr.s
+@attr.s(cmp=False)
 class DigitalOutputPowerDriver(Driver, PowerProtocol):
     """DigitalOutputPowerDriver - Driver using a DigitalOutput to reset the target and
     subprocesses to turn it on and off"""

diff --git a/labgrid/driver/qemudriver.py b/labgrid/driver/qemudriver.py
@@ -21,7 +21,7 @@
 
 
 @target_factory.reg_driver
-@attr.s
+@attr.s(cmp=False)
 class QEMUDriver(ConsoleExpectMixin, Driver, PowerProtocol, ConsoleProtocol):
     """
     The QEMUDriver implements an interface to start targets as qemu instances.

diff --git a/labgrid/driver/serialdriver.py b/labgrid/driver/serialdriver.py
@@ -13,7 +13,7 @@
 
 
 @target_factory.reg_driver
-@attr.s
+@attr.s(cmp=False)
 class SerialDriver(ConsoleExpectMixin, Driver, ConsoleProtocol):
     """
     Driver implementing the ConsoleProtocol interface over a SerialPort connection

diff --git a/labgrid/driver/shelldriver.py b/labgrid/driver/shelldriver.py
@@ -24,7 +24,7 @@
 
 
 @target_factory.reg_driver
-@attr.s
+@attr.s(cmp=False)
 class ShellDriver(CommandMixin, Driver, CommandProtocol, FileTransferProtocol):
     """ShellDriver - Driver to execute commands on the shell
     ShellDriver binds on top of a ConsoleProtocol.

diff --git a/labgrid/driver/sshdriver.py b/labgrid/driver/sshdriver.py
@@ -19,7 +19,7 @@
 
 
 @target_factory.reg_driver
-@attr.s
+@attr.s(cmp=False)
 class SSHDriver(CommandMixin, Driver, CommandProtocol, FileTransferProtocol):
     """SSHDriver - Driver to execute commands via SSH"""
     bindings = {"networkservice": NetworkService, }

diff --git a/labgrid/driver/ubootdriver.py b/labgrid/driver/ubootdriver.py
@@ -16,7 +16,7 @@
 
 
 @target_factory.reg_driver
-@attr.s
+@attr.s(cmp=False)
 class UBootDriver(CommandMixin, Driver, CommandProtocol, LinuxBootProtocol):
     """UBootDriver - Driver to control uboot via the console.
     UBootDriver binds on top of a ConsoleProtocol.

diff --git a/labgrid/driver/usbloader.py b/labgrid/driver/usbloader.py
@@ -13,7 +13,7 @@
 
 
 @target_factory.reg_driver
-@attr.s
+@attr.s(cmp=False)
 class MXSUSBDriver(Driver, BootstrapProtocol):
     bindings = {
         "loader": {MXSUSBLoader, NetworkMXSUSBLoader},
@@ -48,7 +48,7 @@ def load(self, filename=None):
 
 
 @target_factory.reg_driver
-@attr.s
+@attr.s(cmp=False)
 class IMXUSBDriver(Driver, BootstrapProtocol):
     bindings = {
         "loader": {IMXUSBLoader, NetworkIMXUSBLoader},

diff --git a/labgrid/driver/usbstorage.py b/labgrid/driver/usbstorage.py
@@ -11,7 +11,7 @@
 
 
 @target_factory.reg_driver
-@attr.s
+@attr.s(cmp=False)
 class USBStorageDriver(Driver):
     bindings = {"storage": USBMassStorage, }
 

diff --git a/labgrid/external/usbstick.py b/labgrid/external/usbstick.py
@@ -17,7 +17,7 @@ class USBStatus(enum.Enum):
     mounted = 2
 
 
-@attr.s
+@attr.s(cmp=False)
 class USBStick(object):
     """The USBStick class provides an easy to use interface to describe a
     target as an USB Stick."""

diff --git a/labgrid/resource/base.py b/labgrid/resource/base.py
@@ -3,7 +3,7 @@
 from .common import Resource
 
 
-@attr.s
+@attr.s(cmp=False)
 class SerialPort(Resource):
     """The basic SerialPort describes port and speed
 
@@ -14,7 +14,7 @@ class SerialPort(Resource):
     speed = attr.ib(default=115200, validator=attr.validators.instance_of(int))
 
 
-@attr.s
+@attr.s(cmp=False)
 class EthernetInterface(Resource):
     """The basic EthernetInterface contains an interfacename
 

diff --git a/labgrid/resource/common.py b/labgrid/resource/common.py
@@ -3,7 +3,7 @@
 from ..binding import BindingMixin
 
 
-@attr.s
+@attr.s(cmp=False)
 class Resource(BindingMixin):
     """
     Represents a resource which is used by drivers. It only stores information
@@ -24,7 +24,7 @@ def command_prefix(self):
         return []
 
 
-@attr.s
+@attr.s(cmp=False)
 class NetworkResource(Resource):
     """
     Represents a remote Resource available on another computer.
@@ -71,7 +71,7 @@ def poll(self):
         pass
 
 
-@attr.s
+@attr.s(cmp=False)
 class ManagedResource(Resource):
     """
     Represents a resource which can appear and disappear at runtime. Every

diff --git a/labgrid/resource/networkservice.py b/labgrid/resource/networkservice.py
@@ -5,7 +5,7 @@
 
 
 @target_factory.reg_resource
-@attr.s
+@attr.s(cmp=False)
 class NetworkService(Resource):
     address = attr.ib(validator=attr.validators.instance_of(str))
     username = attr.ib(validator=attr.validators.instance_of(str))
diff --git a/labgrid/resource/onewireport.py b/labgrid/resource/onewireport.py
@@ -5,7 +5,7 @@
 
 
 @target_factory.reg_resource
-@attr.s
+@attr.s(cmp=False)
 class OneWirePIO(Resource):
     """This resource describes a Onewire PIO Port.
 

diff --git a/labgrid/resource/power.py b/labgrid/resource/power.py
@@ -5,7 +5,7 @@
 
 
 @target_factory.reg_resource
-@attr.s
+@attr.s(cmp=False)
 class NetworkPowerPort(Resource):
     """The NetworkPowerPort describes a remotely switchable PowerPort
 

diff --git a/labgrid/resource/serialport.py b/labgrid/resource/serialport.py
@@ -6,7 +6,7 @@
 
 
 @target_factory.reg_resource
-@attr.s
+@attr.s(cmp=False)
 class RawSerialPort(SerialPort, Resource):
     """RawSerialPort describes a serialport which is vailable on the local computer."""
     def __attrs_post_init__(self):
@@ -16,7 +16,7 @@ def __attrs_post_init__(self):
 
 # This does not derive from SerialPort because it is not directly accessible
 @target_factory.reg_resource
-@attr.s
+@attr.s(cmp=False)
 class NetworkSerialPort(NetworkResource):
     """A NetworkSerialPort is a remotely accessable serialport, usually
     accessed via rfc2217.

diff --git a/labgrid/resource/udev.py b/labgrid/resource/udev.py
@@ -34,7 +34,7 @@ def poll(self):
                     break
 
 
-@attr.s
+@attr.s(cmp=False)
 class USBResource(ManagedResource):
     manager_cls = UdevManager
 
@@ -144,7 +144,7 @@ def read_attr(self, attribute):
 
 
 @target_factory.reg_resource
-@attr.s
+@attr.s(cmp=False)
 class USBSerialPort(SerialPort, USBResource):
     def __attrs_post_init__(self):
         self.match['SUBSYSTEM'] = 'tty'
@@ -158,7 +158,7 @@ def update(self):
             self.port = None
 
 @target_factory.reg_resource
-@attr.s
+@attr.s(cmp=False)
 class USBMassStorage(USBResource):
     def __attrs_post_init__(self):
         self.match['SUBSYSTEM'] = 'block'
@@ -171,7 +171,7 @@ def path(self):
         return self.device.device_node
 
 @target_factory.reg_resource
-@attr.s
+@attr.s(cmp=False)
 class IMXUSBLoader(USBResource):
     def filter_match(self, device):
         if device.get('ID_VENDOR_ID') != "15a2":
@@ -182,7 +182,7 @@ def filter_match(self, device):
 
 
 @target_factory.reg_resource
-@attr.s
+@attr.s(cmp=False)
 class MXSUSBLoader(USBResource):
     def filter_match(self, device):
         if device.get('ID_VENDOR_ID') != "066f":
@@ -192,7 +192,7 @@ def filter_match(self, device):
         return super().filter_match(device)
 
 @target_factory.reg_resource
-@attr.s
+@attr.s(cmp=False)
 class AndroidFastboot(USBResource):
     def filter_match(self, device):
         if device.get('ID_VENDOR_ID') != "1d6b":
@@ -202,7 +202,7 @@ def filter_match(self, device):
         return super().filter_match(device)
 
 @target_factory.reg_resource
-@attr.s
+@attr.s(cmp=False)
 class USBEthernetInterface(EthernetInterface, USBResource):
     def __attrs_post_init__(self):
         self.match['SUBSYSTEM'] = 'net'
@@ -224,7 +224,7 @@ def if_state(self):
         return value
 
 @target_factory.reg_resource
-@attr.s
+@attr.s(cmp=False)
 class AlteraUSBBlaster(USBResource):
     def filter_match(self, device):
         if device.get('ID_VENDOR_ID') != "09fb":

diff --git a/labgrid/strategy/bareboxstrategy.py b/labgrid/strategy/bareboxstrategy.py
@@ -21,7 +21,7 @@ class Status(enum.Enum):
 
 
 @target_factory.reg_driver
-@attr.s
+@attr.s(cmp=False)
 class BareboxStrategy(Strategy):
     """BareboxStrategy - Strategy to switch to barebox or shell"""
     bindings = {