ev3dev · rhempel · Oct 30, 2015 · Oct 30, 2015 · Oct 30, 2015 · Oct 30, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,11 @@
+language: python
+python:
+    - 2.7
+
+sudo: false
+
+install:
+    - pip install PIL --allow-external PIL --allow-unverified PIL
+
+script:
+    - ./tests/api_tests.py
diff --git a/README.md b/README.md
@@ -1,2 +1,6 @@
 # ev3dev-lang-python
+
+[![Build Status](https://travis-ci.org/ddemidov/ev3dev-lang-python-1.svg?branch=master)](https://travis-ci.org/ddemidov/ev3dev-lang-python-1)
+
 Pure python bindings for ev3dev
+
diff --git a/ev3dev.py b/ev3dev.py
@@ -75,30 +75,29 @@ def file_handle( self, path, mode, reopen=False ):
 
         return f
 
-    def read(self, path, size=-1):
+    def read(self, path):
         f = self.file_handle(path, 'r')
 
         try:
-            value = f.read(size)
+            f.seek(0)
+            value = f.read()
         except IOError:
             f = self.file_handle( path, 'w+', reopen=True )
-            value = f.read(size)
+            value = f.read()
 
-        if size < 0:
-            return value.strip()
-        else:
-            return value
+        return value.strip()
 
     def write(self, path, value):
         f = self.file_handle( path, 'w' )
 
         try:
+            f.seek(0)
             f.write( value )
-            f.flush()
         except IOError:
             f = self.file_handle( path, 'w+', reopen=True )
             f.write( value )
-            f.flush()
+
+        f.flush()
 
 
 #------------------------------------------------------------------------------
@@ -157,9 +156,9 @@ def _matches(self, attribute, pattern):
         else:
             return value.find(pattern) >= 0
 
-    def _get_attribute( self, attribute, size=-1 ):
+    def _get_attribute( self, attribute ):
         """Device attribute getter"""
-        return self._attribute_cache.read(abspath(self._path + '/' + attribute), size)
+        return self._attribute_cache.read(abspath(self._path + '/' + attribute))
 
     def _set_attribute( self, attribute, value ):
         """Device attribute setter"""
@@ -1291,7 +1290,9 @@ def bin_data(self, fmt=None):
                     "float":  4
                 }.get(self.bin_data_format, 1) * self.num_values
 
-        raw = bytearray(self._get_attribute('bin_data', self._bin_data_size))
+        f = self._attribute_cache.file_handle(abspath(self._path + '/bin_data'), 'rb')
+        f.seek(0)
+        raw = bytearray(f.read(self._bin_data_size))
 
         if fmt is None: return raw
 

diff --git a/tests/README.md b/tests/README.md
@@ -0,0 +1,8 @@
+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}/
+```
diff --git a/tests/api_tests.py b/tests/api_tests.py
@@ -0,0 +1,69 @@
+#!/usr/bin/env python
+import unittest, sys, os
+
+sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+
+import ev3dev
+
+ev3dev.Device.DEVICE_ROOT_PATH = os.path.join(os.path.dirname(__file__), 'fake_sys_class')
+
+class TestAPI(unittest.TestCase):
+    def test_device(self):
+        d = ev3dev.Device('tacho-motor', 'motor*')
+        self.assertTrue(d.connected)
+
+        d = ev3dev.Device('tacho-motor', 'motor0')
+        self.assertTrue(d.connected)
+
+        d = ev3dev.Device('tacho-motor', 'motor*', driver_name='lego-ev3-m-motor')
+        self.assertTrue(d.connected)
+
+        d = ev3dev.Device('tacho-motor', 'motor*', port_name='outA')
+        self.assertTrue(d.connected)
+
+        d = ev3dev.Device('tacho-motor', 'motor*', port_name='outA', driver_name='not-valid')
+        self.assertTrue(not d.connected)
+
+        d = ev3dev.Device('lego-sensor', 'sensor*')
+        self.assertTrue(d.connected)
+
+    def test_medium_motor(self):
+        m = ev3dev.MediumMotor()
+
+        self.assertTrue(m.connected);
+
+        self.assertEqual(m.count_per_rot,            360)
+        self.assertEqual(m.commands,                 ['run-forever', 'run-to-abs-pos', 'run-to-rel-pos', 'run-timed', 'run-direct', 'stop', 'reset'])
+        self.assertEqual(m.driver_name,              'lego-ev3-m-motor')
+        self.assertEqual(m.duty_cycle,               0)
+        self.assertEqual(m.duty_cycle_sp,            42)
+        self.assertEqual(m.encoder_polarity,         'normal')
+        self.assertEqual(m.polarity,                 'normal')
+        self.assertEqual(m.port_name,                'outA')
+        self.assertEqual(m.position,                 42)
+        self.assertEqual(m.position_sp,              42)
+        self.assertEqual(m.ramp_down_sp,             0)
+        self.assertEqual(m.ramp_up_sp,               0)
+        self.assertEqual(m.speed,                    0)
+        self.assertEqual(m.speed_regulation_enabled, 'off')
+        self.assertEqual(m.speed_sp,                 0)
+        self.assertEqual(m.state,                    [])
+        self.assertEqual(m.stop_command,             'coast')
+        self.assertEqual(m.time_sp,                  1000)
+
+        with self.assertRaises(Exception):
+            c = m.command
+
+    def test_infrared_sensor(self):
+        s = ev3dev.InfraredSensor()
+
+        self.assertTrue(s.connected)
+
+        self.assertEqual(s.bin_data_format, 's8')
+        self.assertEqual(s.bin_data('<b'),  (16,))
+        self.assertEqual(s.num_values,      1)
+        self.assertEqual(s.port_name,       'in1')
+        self.assertEqual(s.value(0),        16)
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/bin_data b/tests/fake_sys_class/lego-sensor/sensor0/bin_data
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/bin_data_format b/tests/fake_sys_class/lego-sensor/sensor0/bin_data_format
@@ -0,0 +1 @@
+s8
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/command b/tests/fake_sys_class/lego-sensor/sensor0/command
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/commands b/tests/fake_sys_class/lego-sensor/sensor0/commands
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/decimals b/tests/fake_sys_class/lego-sensor/sensor0/decimals
@@ -0,0 +1 @@
+0
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/direct b/tests/fake_sys_class/lego-sensor/sensor0/direct
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/driver_name b/tests/fake_sys_class/lego-sensor/sensor0/driver_name
@@ -0,0 +1 @@
+lego-ev3-ir
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/fw_version b/tests/fake_sys_class/lego-sensor/sensor0/fw_version
@@ -0,0 +1 @@
+
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/mode b/tests/fake_sys_class/lego-sensor/sensor0/mode
@@ -0,0 +1 @@
+IR-PROX
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/modes b/tests/fake_sys_class/lego-sensor/sensor0/modes
@@ -0,0 +1 @@
+IR-PROX IR-SEEK IR-REMOTE IR-REM-A IR-S-ALT IR-CAL
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/num_values b/tests/fake_sys_class/lego-sensor/sensor0/num_values
@@ -0,0 +1 @@
+1
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/poll_ms b/tests/fake_sys_class/lego-sensor/sensor0/poll_ms
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/port_name b/tests/fake_sys_class/lego-sensor/sensor0/port_name
@@ -0,0 +1 @@
+in1
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/power/autosuspend_delay_ms b/tests/fake_sys_class/lego-sensor/sensor0/power/autosuspend_delay_ms
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/power/control b/tests/fake_sys_class/lego-sensor/sensor0/power/control
@@ -0,0 +1 @@
+auto
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/power/runtime_active_time b/tests/fake_sys_class/lego-sensor/sensor0/power/runtime_active_time
@@ -0,0 +1 @@
+0
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/power/runtime_status b/tests/fake_sys_class/lego-sensor/sensor0/power/runtime_status
@@ -0,0 +1 @@
+unsupported
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/power/runtime_suspended_time b/tests/fake_sys_class/lego-sensor/sensor0/power/runtime_suspended_time
@@ -0,0 +1 @@
+0
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/uevent b/tests/fake_sys_class/lego-sensor/sensor0/uevent
@@ -0,0 +1,2 @@
+LEGO_DRIVER_NAME=lego-ev3-ir
+LEGO_PORT_NAME=in1
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/units b/tests/fake_sys_class/lego-sensor/sensor0/units
@@ -0,0 +1 @@
+pct
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/value0 b/tests/fake_sys_class/lego-sensor/sensor0/value0
@@ -0,0 +1 @@
+16
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/value1 b/tests/fake_sys_class/lego-sensor/sensor0/value1
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/value2 b/tests/fake_sys_class/lego-sensor/sensor0/value2
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/value3 b/tests/fake_sys_class/lego-sensor/sensor0/value3
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/value4 b/tests/fake_sys_class/lego-sensor/sensor0/value4
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/value5 b/tests/fake_sys_class/lego-sensor/sensor0/value5
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/value6 b/tests/fake_sys_class/lego-sensor/sensor0/value6
diff --git a/tests/fake_sys_class/lego-sensor/sensor0/value7 b/tests/fake_sys_class/lego-sensor/sensor0/value7
diff --git a/tests/fake_sys_class/tacho-motor/motor0/command b/tests/fake_sys_class/tacho-motor/motor0/command
diff --git a/tests/fake_sys_class/tacho-motor/motor0/commands b/tests/fake_sys_class/tacho-motor/motor0/commands
@@ -0,0 +1 @@
+run-forever run-to-abs-pos run-to-rel-pos run-timed run-direct stop reset
diff --git a/tests/fake_sys_class/tacho-motor/motor0/count_per_rot b/tests/fake_sys_class/tacho-motor/motor0/count_per_rot
@@ -0,0 +1 @@
+360
diff --git a/tests/fake_sys_class/tacho-motor/motor0/driver_name b/tests/fake_sys_class/tacho-motor/motor0/driver_name
@@ -0,0 +1 @@
+lego-ev3-m-motor
diff --git a/tests/fake_sys_class/tacho-motor/motor0/duty_cycle b/tests/fake_sys_class/tacho-motor/motor0/duty_cycle
@@ -0,0 +1 @@
+0
diff --git a/tests/fake_sys_class/tacho-motor/motor0/duty_cycle_sp b/tests/fake_sys_class/tacho-motor/motor0/duty_cycle_sp
@@ -0,0 +1 @@
+42
diff --git a/tests/fake_sys_class/tacho-motor/motor0/encoder_polarity b/tests/fake_sys_class/tacho-motor/motor0/encoder_polarity
@@ -0,0 +1 @@
+normal
diff --git a/tests/fake_sys_class/tacho-motor/motor0/hold_pid/Kd b/tests/fake_sys_class/tacho-motor/motor0/hold_pid/Kd
diff --git a/tests/fake_sys_class/tacho-motor/motor0/hold_pid/Ki b/tests/fake_sys_class/tacho-motor/motor0/hold_pid/Ki
diff --git a/tests/fake_sys_class/tacho-motor/motor0/hold_pid/Kp b/tests/fake_sys_class/tacho-motor/motor0/hold_pid/Kp
diff --git a/tests/fake_sys_class/tacho-motor/motor0/polarity b/tests/fake_sys_class/tacho-motor/motor0/polarity
@@ -0,0 +1 @@
+normal
diff --git a/tests/fake_sys_class/tacho-motor/motor0/port_name b/tests/fake_sys_class/tacho-motor/motor0/port_name
@@ -0,0 +1 @@
+outA
diff --git a/tests/fake_sys_class/tacho-motor/motor0/position b/tests/fake_sys_class/tacho-motor/motor0/position
@@ -0,0 +1 @@
+42
diff --git a/tests/fake_sys_class/tacho-motor/motor0/position_sp b/tests/fake_sys_class/tacho-motor/motor0/position_sp
@@ -0,0 +1 @@
+42
diff --git a/tests/fake_sys_class/tacho-motor/motor0/power/autosuspend_delay_ms b/tests/fake_sys_class/tacho-motor/motor0/power/autosuspend_delay_ms
diff --git a/tests/fake_sys_class/tacho-motor/motor0/power/control b/tests/fake_sys_class/tacho-motor/motor0/power/control
@@ -0,0 +1 @@
+auto
diff --git a/tests/fake_sys_class/tacho-motor/motor0/power/runtime_active_time b/tests/fake_sys_class/tacho-motor/motor0/power/runtime_active_time
@@ -0,0 +1 @@
+0
diff --git a/tests/fake_sys_class/tacho-motor/motor0/power/runtime_status b/tests/fake_sys_class/tacho-motor/motor0/power/runtime_status
@@ -0,0 +1 @@
+unsupported
diff --git a/tests/fake_sys_class/tacho-motor/motor0/power/runtime_suspended_time b/tests/fake_sys_class/tacho-motor/motor0/power/runtime_suspended_time
@@ -0,0 +1 @@
+0
diff --git a/tests/fake_sys_class/tacho-motor/motor0/ramp_down_sp b/tests/fake_sys_class/tacho-motor/motor0/ramp_down_sp
@@ -0,0 +1 @@
+0
diff --git a/tests/fake_sys_class/tacho-motor/motor0/ramp_up_sp b/tests/fake_sys_class/tacho-motor/motor0/ramp_up_sp
@@ -0,0 +1 @@
+0
diff --git a/tests/fake_sys_class/tacho-motor/motor0/speed b/tests/fake_sys_class/tacho-motor/motor0/speed
@@ -0,0 +1 @@
+0
diff --git a/tests/fake_sys_class/tacho-motor/motor0/speed_pid/Kd b/tests/fake_sys_class/tacho-motor/motor0/speed_pid/Kd
@@ -0,0 +1 @@
+0
diff --git a/tests/fake_sys_class/tacho-motor/motor0/speed_pid/Ki b/tests/fake_sys_class/tacho-motor/motor0/speed_pid/Ki
@@ -0,0 +1 @@
+60
diff --git a/tests/fake_sys_class/tacho-motor/motor0/speed_pid/Kp b/tests/fake_sys_class/tacho-motor/motor0/speed_pid/Kp
@@ -0,0 +1 @@
+1000
diff --git a/tests/fake_sys_class/tacho-motor/motor0/speed_regulation b/tests/fake_sys_class/tacho-motor/motor0/speed_regulation
@@ -0,0 +1 @@
+off
diff --git a/tests/fake_sys_class/tacho-motor/motor0/speed_sp b/tests/fake_sys_class/tacho-motor/motor0/speed_sp
@@ -0,0 +1 @@
+0
diff --git a/tests/fake_sys_class/tacho-motor/motor0/state b/tests/fake_sys_class/tacho-motor/motor0/state
@@ -0,0 +1 @@
+
diff --git a/tests/fake_sys_class/tacho-motor/motor0/stop_command b/tests/fake_sys_class/tacho-motor/motor0/stop_command
@@ -0,0 +1 @@
+coast
diff --git a/tests/fake_sys_class/tacho-motor/motor0/stop_commands b/tests/fake_sys_class/tacho-motor/motor0/stop_commands
@@ -0,0 +1 @@
+coast brake hold
diff --git a/tests/fake_sys_class/tacho-motor/motor0/time_sp b/tests/fake_sys_class/tacho-motor/motor0/time_sp
@@ -0,0 +1 @@
+1000
diff --git a/tests/fake_sys_class/tacho-motor/motor0/uevent b/tests/fake_sys_class/tacho-motor/motor0/uevent
@@ -0,0 +1,2 @@
+LEGO_DRIVER_NAME=lego-ev3-m-motor
+LEGO_PORT_NAME=outA
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		IR-PROX IR-SEEK IR-REMOTE IR-REM-A IR-S-ALT IR-CAL
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		LEGO_DRIVER_NAME=lego-ev3-ir
		LEGO_PORT_NAME=in1
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		run-forever run-to-abs-pos run-to-rel-pos run-timed run-direct stop reset
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		LEGO_DRIVER_NAME=lego-ev3-m-motor
		LEGO_PORT_NAME=outA