Merge pull request #1449 from Bastian-Krause/bst/examples-fixes

examples: fixes, cleanup, use StepLogger instead of StepReporter

Author: Bastian-Krause

examples/deditec-relais8/deditec.py

@@ -1,24 +1,19 @@
-import sys
-import labgrid
 import logging
 import time
 
-from labgrid import Environment, StepReporter
-from labgrid.strategy.bareboxstrategy import Status
-from labgrid.driver.deditecrelaisdriver import DeditecRelaisDriver
+from labgrid import Target
+from labgrid.logging import basicConfig, StepLogger
+from labgrid.resource.udev import DeditecRelais8
+from labgrid.driver import DeditecRelaisDriver
 
-# enable debug logging
-logging.basicConfig(
-    level=logging.DEBUG,
-    format='%(levelname)7s: %(message)s',
-    stream=sys.stderr,
-)
+# enable info logging
+basicConfig(level=logging.INFO)
 
-# show labgrid steps on the console
-StepReporter.start()
+# log labgrid steps
+StepLogger.start()
 
-t = labgrid.Target('main')
-r = labgrid.resource.udev.DeditecRelais8(t, name=None, index=1)
+t = Target('main')
+r = DeditecRelais8(t, name=None, index=1)
 d = DeditecRelaisDriver(t, name=None)
 
 p = t.get_driver("DigitalOutputProtocol")

examples/deditec-relais8/deditec_remote.py

@@ -1,23 +1,16 @@
-import sys
-import labgrid
 import logging
 import time
 
-from labgrid import Environment, StepReporter
-from labgrid.strategy.bareboxstrategy import Status
-from labgrid.driver.deditecrelaisdriver import DeditecRelaisDriver
+from labgrid import Environment
+from labgrid.logging import basicConfig, StepLogger
 
-# enable debug logging
-logging.basicConfig(
-    level=logging.DEBUG,
-    format='%(levelname)7s: %(message)s',
-    stream=sys.stderr,
-)
+# enable info logging
+basicConfig(level=logging.INFO)
 
 # show labgrid steps on the console
-StepReporter.start()
+StepLogger.start()
 
-e = labgrid.Environment('import-dedicontrol.yaml')
+e = Environment('import-dedicontrol.yaml')
 t = e.get_target()
 
 p = t.get_driver("DigitalOutputProtocol")

examples/library/test.py

@@ -4,19 +4,16 @@
 import sys
 import logging
 
-from labgrid import Environment, StepReporter
+from labgrid import Environment
+from labgrid.logging import basicConfig, StepLogger
 from labgrid.strategy.bareboxstrategy import Status
 
 
-# enable debug logging
-logging.basicConfig(
-    level=logging.DEBUG,
-    format='%(levelname)7s: %(message)s',
-    stream=sys.stderr,
-)
+# enable info logging
+basicConfig(level=logging.INFO)
 
-# show labgrid steps on the console
-StepReporter.start()
+# log labgrid steps
+StepLogger.start()
 
 def run_once(target):
     s = target.get_driver('BareboxStrategy')

examples/networkmanager/nm.py

@@ -1,18 +1,15 @@
-import logging, sys
+import logging
 from pprint import pprint
 
-from labgrid import *
+from labgrid import Environment
+from labgrid.logging import basicConfig, StepLogger
 
 
 # enable debug logging
-logging.basicConfig(
-    level=logging.DEBUG,
-    format='%(levelname)7s: %(message)s',
-    stream=sys.stderr,
-)
+basicConfig(level=logging.DEBUG)
 
 # show labgrid steps on the console
-StepReporter.start()
+StepLogger.start()
 
 
 e = Environment('nm.env')

examples/qemu-networking/qemunetworkstrategy.py

@@ -17,7 +17,7 @@
 import attr
 
 from labgrid import target_factory, step
-from labgrid.strategy import Strategy
+from labgrid.strategy import Strategy, StrategyError
 from labgrid.util import get_free_port
 
 
@@ -75,15 +75,15 @@ def update_network_service(self):
                 networkservice.port = local_port
             else:
                 networkservice.address = new_address
-                networkserivce.port = self.__remote_port
+                networkservice.port = self.__remote_port
 
     @step(args=["state"])
     def transition(self, state, *, step):
         if not isinstance(state, Status):
             state = Status[state]
 
         if state == Status.unknown:
-            raise StrategyError(f"can not transition to {new_status}")
+            raise StrategyError(f"can not transition to {state}")
 
         elif self.status == state:
             step.skip("nothing to do")
@@ -99,4 +99,4 @@ def transition(self, state, *, step):
             self.target.activate(self.shell)
             self.update_network_service()
 
-        self.status = status
+        self.status = state

examples/sigrok/main.py

@@ -6,13 +6,10 @@
 import logging
 
 from labgrid import Environment
+from labgrid.logging import basicConfig
 
-# enable debug logging
-logging.basicConfig(
-    level=logging.DEBUG,
-    format='%(levelname)7s: %(message)s',
-    stream=sys.stderr,
-)
+# enable info logging
+basicConfig(level=logging.INFO)
 
 env = Environment(sys.argv[1])
 target = env.get_target('main')

examples/strategy/bareboxrebootstrategy.py

@@ -2,11 +2,10 @@
 
 import attr
 
+from labgrid import target_factory, step
 from labgrid.driver import BareboxDriver, ShellDriver
 from labgrid.protocol import PowerProtocol
-from labgrid.factory import target_factory
-from labgrid.step import step
-from labgrid.strategy.common import Strategy
+from labgrid.strategy import Strategy
 
 
 @attr.s(eq=False)

examples/strategy/quartusstrategy.py

@@ -2,11 +2,10 @@
 
 import attr
 
+from labgrid import target_factory, step
 from labgrid.driver import QuartusHPSDriver, SerialDriver
-from labgrid.factory import target_factory
 from labgrid.protocol import PowerProtocol
-from labgrid.step import step
-from labgrid.strategy.common import Strategy
+from labgrid.strategy import Strategy
 
 
 @attr.s(eq=False)

examples/strategy/test_barebox_strategy.py

@@ -1,7 +1,5 @@
 import pytest
 
-from labgrid.exceptions import NoDriverFoundError
-
 
 @pytest.fixture(scope="function")
 def in_bootloader(strategy, capsys):

examples/sysfsgpio/sysfsgpio.py

@@ -1,23 +1,19 @@
-import sys
-import labgrid
 import logging
 import time
 
-from labgrid import Environment, StepReporter
-from labgrid.driver.gpiodriver import GpioDigitalOutputDriver
+from labgrid import Target
+from labgrid.logging import basicConfig, StepLogger
+from labgrid.driver import GpioDigitalOutputDriver
+from labgrid.resource import SysfsGPIO
 
-# enable debug logging
-logging.basicConfig(
-    level=logging.DEBUG,
-    format='%(levelname)7s: %(message)s',
-    stream=sys.stderr,
-)
+# enable info logging
+basicConfig(level=logging.INFO)
 
 # show labgrid steps on the console
-StepReporter.start()
+StepLogger.start()
 
-t = labgrid.Target('main')
-r = labgrid.resource.base.SysfsGPIO(t, name=None, index=60)
+t = Target('main')
+r = SysfsGPIO(t, name=None, index=60)
 d = GpioDigitalOutputDriver(t, name=None)
 
 p = t.get_driver("DigitalOutputProtocol")