Fix 4.1+ bug with tests.

Author: Matthew West

test/test_pwm_setup.py

@@ -12,27 +12,31 @@ def teardown_module(module):
     PWM.cleanup()
 
 
+def get_pwm_dir():
+    if kernel >= '4.1.0':
+        # On 4.1+, the pwm subdirectory sometimes takes different names:
+        # .pwm or .ehrpwm, etc.
+        results = glob.glob(
+            "/sys/devices/platform/ocp/48302000.*/" +
+            "48302200.*/pwm/pwmchip?/pwm0")
+        # We expect that there will be a result (a directory fitting
+        # our path exists) so test that with an assertion.
+        assert len(results) > 0
+        # Continue with the pwm_dir found
+        return results[0]
+    else:
+        files = os.listdir('/sys/devices')
+        ocp = '/sys/devices/' + [s for s in files if s.startswith('ocp')][0]
+        files = os.listdir(ocp)
+        return ocp + '/' + [s for s in files if s.startswith('pwm_test_P9_14')][0]
+
+
 class TestPwmSetup:
     def test_start_pwm(self):
         PWM.cleanup()
         PWM.start("P9_14", 0)
 
-        if kernel >= '4.1.0':
-            # On 4.1+, the pwm subdirectory sometimes takes different names:
-            # .pwm or .ehrpwm, etc.
-            results = glob.glob(
-                "/sys/devices/platform/ocp/48302000.*/" +
-                "48302200.*/pwm/pwmchip2/pwm0")
-            # We expect that there will be a result (a directory fitting
-            # our path exists) so test that with an assertion.
-            assert len(results) > 0
-            # Continue with the pwm_dir found
-            pwm_dir = results[0]
-        else:
-            files = os.listdir('/sys/devices')
-            ocp = '/sys/devices/' + [s for s in files if s.startswith('ocp')][0]
-            files = os.listdir(ocp)
-            pwm_dir = ocp + '/' + [s for s in files if s.startswith('pwm_test_P9_14')][0]
+        pwm_dir = get_pwm_dir()
 
         assert os.path.exists(pwm_dir)
         if kernel >= '4.1.0':
@@ -48,13 +52,7 @@ def test_start_pwm_with_polarity_one(self):
         PWM.cleanup()
         PWM.start("P9_14", 0, 2000, 1)
 
-        if kernel >= '4.1.0':
-            pwm_dir = "/sys/devices/platform/ocp/48302000.epwmss/48302200.ehrpwm/pwm/pwmchip2/pwm0"
-        else:
-            files = os.listdir('/sys/devices')
-            ocp = '/sys/devices/' + [s for s in files if s.startswith('ocp')][0]
-            files = os.listdir(ocp)
-            pwm_dir = ocp + '/' + [s for s in files if s.startswith('pwm_test_P9_14')][0]
+        pwm_dir = get_pwm_dir()
 
         assert os.path.exists(pwm_dir)
         if kernel >= '4.1.0':
@@ -76,13 +74,7 @@ def test_start_pwm_with_polarity_default(self):
         PWM.cleanup()
         PWM.start("P9_14", 0, 2000)
 
-        if kernel >= '4.1.0':
-            pwm_dir = "/sys/devices/platform/ocp/48302000.epwmss/48302200.ehrpwm/pwm/pwmchip2/pwm0"
-        else:
-            files = os.listdir('/sys/devices')
-            ocp = '/sys/devices/' + [s for s in files if s.startswith('ocp')][0]
-            files = os.listdir(ocp)
-            pwm_dir = ocp + '/' + [s for s in files if s.startswith('pwm_test_P9_14')][0]
+        pwm_dir = get_pwm_dir()
 
         assert os.path.exists(pwm_dir)
         if kernel >= '4.1.0':
@@ -104,13 +96,7 @@ def test_start_pwm_with_polarity_zero(self):
         PWM.cleanup()
         PWM.start("P9_14", 0, 2000, 0)
 
-        if kernel >= '4.1.0':
-            pwm_dir = "/sys/devices/platform/ocp/48302000.epwmss/48302200.ehrpwm/pwm/pwmchip2/pwm0"
-        else:
-            files = os.listdir('/sys/devices')
-            ocp = '/sys/devices/' + [s for s in files if s.startswith('ocp')][0]
-            files = os.listdir(ocp)
-            pwm_dir = ocp + '/' + [s for s in files if s.startswith('pwm_test_P9_14')][0]
+        pwm_dir = get_pwm_dir()
 
         assert os.path.exists(pwm_dir)
         if kernel >= '4.1.0':
@@ -189,13 +175,7 @@ def test_pwm_duty_modified(self):
         PWM.cleanup()
         PWM.start("P9_14", 0)
 
-        if kernel >= '4.1.0':
-            pwm_dir = "/sys/devices/platform/ocp/48302000.epwmss/48302200.ehrpwm/pwm/pwmchip2/pwm0"
-        else:
-            files = os.listdir('/sys/devices')
-            ocp = '/sys/devices/' + [s for s in files if s.startswith('ocp')][0]
-            files = os.listdir(ocp)
-            pwm_dir = ocp + '/' + [s for s in files if s.startswith('pwm_test_P9_14')][0]
+        pwm_dir = get_pwm_dir()
 
         assert os.path.exists(pwm_dir)
         if kernel >= '4.1.0':