Stretch fixes (#366)

dwalton76 · web-flow · commit 06ae05faf27f · 2017-09-20T19:17:59.000-04:00
* list the device name in 'Device not connected' Exception

* api_test.py must use python3

* Update README for tests

* Update to latest ev3dev-lang to pick up stretch fixes

* Update tests/README

* Update tests/README
diff --git a/ev3dev-lang b/ev3dev-lang
@@ -1 +1 @@
-Subproject commit 008804f5c28acd225f1b43057be2060d9965b2c1
+Subproject commit 0169750bf9aeefac423c38929287b4ad9ef7abd4
diff --git a/ev3dev/core.py b/ev3dev/core.py
@@ -42,6 +42,7 @@
 import fnmatch
 import numbers
 import array
+import logging
 import mmap
 import ctypes
 import re
@@ -54,6 +55,8 @@
 from struct import pack, unpack
 from subprocess import Popen, check_output, PIPE
 
+log = logging.getLogger(__name__)
+
 try:
     # This is a linux-specific module.
     # It is required by the Button() class, but failure to import it may be
@@ -196,7 +199,8 @@ def _get_attribute(self, attribute, name):
                 attribute.seek(0)
             return attribute, attribute.read().strip().decode()
         else:
-            raise Exception('Device is not connected')
+            log.info("%s: path %s, attribute %s" % (self, self._path, name))
+            raise Exception("%s is not connected" % self)
 
     def _set_attribute(self, attribute, name, value):
         """Device attribute setter"""
@@ -213,7 +217,8 @@ def _set_attribute(self, attribute, name, value):
                 self._raise_friendly_access_error(ex, name)
             return attribute
         else:
-            raise Exception('Device is not connected')
+            log.info("%s: path %s, attribute %s" % (self, self._path, name))
+            raise Exception("%s is not connected" % self)
 
     def _raise_friendly_access_error(self, driver_error, attribute):
         if not isinstance(driver_error, OSError):
diff --git a/ev3dev/ev3.py b/ev3dev/ev3.py
@@ -47,10 +47,10 @@ class Leds(object):
 
 # ~autogen led-colors platforms.ev3.led>currentClass
 
-    red_left = Led(name_pattern='ev3:left:red:ev3dev')
-    red_right = Led(name_pattern='ev3:right:red:ev3dev')
-    green_left = Led(name_pattern='ev3:left:green:ev3dev')
-    green_right = Led(name_pattern='ev3:right:green:ev3dev')
+    red_left = Led(name_pattern='led0:red:brick-status')
+    red_right = Led(name_pattern='led1:red:brick-status')
+    green_left = Led(name_pattern='led0:green:brick-status')
+    green_right = Led(name_pattern='led1:green:brick-status')
 
     LEFT = ( red_left, green_left, )
     RIGHT = ( red_right, green_right, )
@@ -165,12 +165,12 @@ def on_backspace(state):
 
 
     _buttons = {
-            'up': {'name': '/dev/input/by-path/platform-gpio-keys.0-event', 'value': 103},
-            'down': {'name': '/dev/input/by-path/platform-gpio-keys.0-event', 'value': 108},
-            'left': {'name': '/dev/input/by-path/platform-gpio-keys.0-event', 'value': 105},
-            'right': {'name': '/dev/input/by-path/platform-gpio-keys.0-event', 'value': 106},
-            'enter': {'name': '/dev/input/by-path/platform-gpio-keys.0-event', 'value': 28},
-            'backspace': {'name': '/dev/input/by-path/platform-gpio-keys.0-event', 'value': 14},
+            'up': {'name': '/dev/input/by-path/platform-gpio_keys-event', 'value': 103},
+            'down': {'name': '/dev/input/by-path/platform-gpio_keys-event', 'value': 108},
+            'left': {'name': '/dev/input/by-path/platform-gpio_keys-event', 'value': 105},
+            'right': {'name': '/dev/input/by-path/platform-gpio_keys-event', 'value': 106},
+            'enter': {'name': '/dev/input/by-path/platform-gpio_keys-event', 'value': 28},
+            'backspace': {'name': '/dev/input/by-path/platform-gpio_keys-event', 'value': 14},
         }
 
     @property
diff --git a/tests/README.md b/tests/README.md
@@ -1,8 +1,27 @@
+# fake-sys directory
+The tests require the fake-sys directory which comes from
+https://github.com/ddemidov/ev3dev-lang-fake-sys
+
+If you have already cloned the ev3dev-lang-python repo but do not have the
+`fake-sys` directory use `git submodule init` to get it.  If you have not
+already cloned the ev3dev-lang-python repo you can use the `--recursive` option
+when you git clone.  Example:
+
+```
+$ git clone --recursive https://github.com/rhempel/ev3dev-lang-python.git
+```
+
+# Running Tests
+To run the tests do:
+```
+$ ./api_tests.py
+```
+
+# Misc
 Commands used to copy the /sys/class node:
 
-```sh
-node=lego-sensor/sensor0
-mkdir -p ./${node}
-# Copy contents of special files, do not follow symlinks:
-cp -P --copy-contents -r /sys/class/${node}/* ./${node}/
+```
+$ node=lego-sensor/sensor0
+$ mkdir -p ./${node}
+$ cp -P --copy-contents -r /sys/class/${node}/* ./${node}/
 ```
diff --git a/tests/api_tests.py b/tests/api_tests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import unittest, sys, os
 
 FAKE_SYS = os.path.join(os.path.dirname(__file__), 'fake-sys')

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env python`
	`1`	`+#!/usr/bin/env python3`
`2`	`2`	`import unittest, sys, os`
`3`	`3`
`4`	`4`	`FAKE_SYS = os.path.join(os.path.dirname(__file__), 'fake-sys')`