Merge pull request #108 from ddemidov/update-tests

Update tests to use the new functionality in fake-sys

Author: rhempel

tests/api_tests.py

@@ -1,14 +1,23 @@
 #!/usr/bin/env python
 import unittest, sys, os
 
+FAKE_SYS = os.path.join(os.path.dirname(__file__), 'fake-sys')
+
+sys.path.append(FAKE_SYS)
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 
+from populate_arena import populate_arena
+from clean_arena    import clean_arena
+
 import ev3dev.ev3 as ev3
 
-ev3.Device.DEVICE_ROOT_PATH = os.path.join(os.path.dirname(__file__), 'fake-sys')
+ev3.Device.DEVICE_ROOT_PATH = os.path.join(FAKE_SYS, 'arena')
 
 class TestAPI(unittest.TestCase):
     def test_device(self):
+        clean_arena()
+        populate_arena({'medium_motor' : [0, 'outA'], 'infrared_sensor' : [0, 'in1']})
+
         d = ev3.Device('tacho-motor', 'motor*')
         self.assertTrue(d.connected)
 
@@ -31,6 +40,9 @@ def test_medium_motor(self):
         def dummy(self):
             pass
 
+        clean_arena()
+        populate_arena({'medium_motor' : [0, 'outA']})
+
         # Do not write motor.command on exit (so that fake tree stays intact)
         ev3.MediumMotor.__del__ = dummy
 
@@ -66,6 +78,9 @@ def dummy(self):
             c = m.command
 
     def test_infrared_sensor(self):
+        clean_arena()
+        populate_arena({'infrared_sensor' : [0, 'in1']})
+
         s = ev3.InfraredSensor()
 
         self.assertTrue(s.connected)