Merge pull request #9 from SmithChart/less-flaky

Overhaul falky tests

Author: SmithChart

README.md

@@ -51,6 +51,11 @@ The minimum resources needed to control an LXA TAC DUT are:
 - **HTTPProvider**: An HTTP-Server that can be used by labgrid to serve images to the DUT.
   Used to test streaming updates using RAUC.
 
+Optionally the following resource should be attached:
+
+- **USB Mass Storage**: The test `test_labgrid_resources_usb` assumes that a USB mass storage
+  device is connected to one of the host ports.
+
 The labgrid environments provided here are the ones used during development and thus contain settings specific to our
 lab.
 However, the `lxatac-vanialla.yml` is a good starting point to configure your own environment.

agents/lxatac-eet.py

@@ -210,7 +210,7 @@ def connect(self, spec="", ignore_exclusive=False):
                 raise ValueError(f"Last path element {path[-1]} must be a leave")
 
             if any(p not in self.NON_LEAVES for p in path[1:-1]):
-                raise ValueError(f'All in-between path elements ({" -> ".join(path[1:-1])}) must be non-leaves')
+                raise ValueError(f"All in-between path elements ({' -> '.join(path[1:-1])}) must be non-leaves")
 
             prev_node = path[0]
 

tests/test_network.py

@@ -54,10 +54,10 @@ def test_network_tftp(prepare_network, shell):
         assert len(checksum1) > 0
 
         # Upload file to tftp server
-        shell.run_check("ip netns exec dut-namespace tftp -p -r ./test_file 10.11.12.2")
+        shell.run_check("ip netns exec dut-namespace tftp -p -r ./test_file 10.11.12.2", timeout=35)
 
         # Download file from tftp server
-        shell.run_check("ip netns exec dut-namespace tftp -g -r test_file 10.11.12.2")
+        shell.run_check("ip netns exec dut-namespace tftp -g -r test_file 10.11.12.2", timeout=35)
 
         # Generate checksum
         checksum2 = shell.run_check("md5sum ./test_file")

tests/test_tacd.py

@@ -298,29 +298,34 @@ def test_tacd_dut_power_off_floating(strategy, shell, eet):
 
     # Connect 5V via 1K Ohm to PWR_OUT
     eet.link("5V_1K -> 5V -> BUS1 -> VOLT, PWR_OUT -> BUS2 -> VOLT")
-    time.sleep(0.2)  # Give measurements a moment to settle
+    time.sleep(0.5)  # Give measurements a moment to settle
 
     # measure DUT voltage
     r = requests.get(f"http://{strategy.network.address}/v1/dut/feedback/voltage")
     assert r.status_code == 200
     off_voltage = r.json()["value"]
-    assert 3 < off_voltage < 5.5  # USB supply voltage can be all over the place
+
+    # USB supply voltage can be all over the place
+    assert 3 < off_voltage < 5.5, "Off-voltage is not inside USB-Supply range"
 
     # Switch power switch to off without the load.
     r = requests.put(f"http://{strategy.network.address}/v1/dut/powered", data=b'"OffFloating"')
     assert r.status_code == 204
-    time.sleep(0.2)  # Give measurements a moment to settle
+    time.sleep(0.5)  # Give measurements a moment to settle
 
     # measure DUT voltage
     r = requests.get(f"http://{strategy.network.address}/v1/dut/feedback/voltage")
     assert r.status_code == 200
     floating_voltage = r.json()["value"]
-    assert 3 < floating_voltage < 5.5  # USB supply voltage can be all over the place
 
-    assert floating_voltage > off_voltage
+    # USB supply voltage can be all over the place
+    assert 3 < floating_voltage < 5.5, "OffFloating-voltage is not inside USB-supply range"
+
+    # Make sure both measurements have the right relation
+    assert floating_voltage > off_voltage, "OffFloating-voltage is not higher than Off-voltage"
 
     # Voltage relation is given by the voltage divider of 1k and 10k
-    assert off_voltage / floating_voltage == pytest.approx(10e3 / (10e3 + 1e3), rel=0.1)
+    assert off_voltage / floating_voltage == pytest.approx(10e3 / (10e3 + 1e3), rel=0.15)
 
 
 @pytest.mark.lg_feature("eet")