Merge branch 'asomov-master'

Author: tdicola

setup.py

@@ -18,4 +18,5 @@
       license           = 'MIT',
       url               = 'https://github.com/adafruit/Adafruit_Python_GPIO/',
       install_requires  = requires,
+      test_suite        = 'tests',
       packages          = find_packages())

test/MockGPIO.py tests/MockGPIO.py

@@ -25,6 +25,7 @@
 
 import Adafruit_GPIO as GPIO
 import Adafruit_GPIO.SPI as SPI
+import Adafruit_GPIO.Platform as Platform
 
 from MockGPIO import MockGPIO
 
@@ -211,17 +212,17 @@ def test_cleanup_pin(self):
 
 class TestGetPlatformGPIO(unittest.TestCase):
     @patch.dict('sys.modules', {'RPi': Mock(), 'RPi.GPIO': Mock()})
-    @patch('platform.platform', Mock(return_value='Linux-3.10.25+-armv6l-with-debian-7.4'))
+    @patch('Adafruit_GPIO.Platform.platform_detect', Mock(return_value=Platform.RASPBERRY_PI))
     def test_raspberrypi(self):
         gpio = GPIO.get_platform_gpio()
         self.assertIsInstance(gpio, GPIO.RPiGPIOAdapter)
 
     @patch.dict('sys.modules', {'Adafruit_BBIO': Mock(), 'Adafruit_BBIO.GPIO': Mock()})
-    @patch('platform.platform', Mock(return_value='Linux-3.8.13-bone47-armv7l-with-debian-7.4'))
+    @patch('Adafruit_GPIO.Platform.platform_detect', Mock(return_value=Platform.BEAGLEBONE_BLACK))
     def test_beagleboneblack(self):
         gpio = GPIO.get_platform_gpio()
         self.assertIsInstance(gpio, GPIO.AdafruitBBIOAdapter)
 
-    @patch('platform.platform', Mock(return_value='Darwin-13.2.0-x86_64-i386-64bit'))
-    def test_otherplatform(self):
+    @patch('Adafruit_GPIO.Platform.platform_detect', Mock(return_value=Platform.UNKNOWN))
+    def test_unknown(self):
         self.assertRaises(RuntimeError, GPIO.get_platform_gpio)

tests/__init__.py

@@ -24,6 +24,7 @@
 from mock import Mock, patch
 
 import Adafruit_GPIO.PWM as PWM
+import Adafruit_GPIO.Platform as Platform
 
 
 class TestRPi_PWM_Adapter(unittest.TestCase):
@@ -86,17 +87,17 @@ def test_set_frequency(self):
 
 class TestGetPlatformPWM(unittest.TestCase):
     @patch.dict('sys.modules', {'RPi': Mock(), 'RPi.GPIO': Mock()})
-    @patch('platform.platform', Mock(return_value='Linux-3.10.25+-armv6l-with-debian-7.4'))
+    @patch('Adafruit_GPIO.Platform.platform_detect', Mock(return_value=Platform.RASPBERRY_PI))
     def test_raspberrypi(self):
         pwm = PWM.get_platform_pwm()
         self.assertIsInstance(pwm, PWM.RPi_PWM_Adapter)
 
     @patch.dict('sys.modules', {'Adafruit_BBIO': Mock(), 'Adafruit_BBIO.PWM': Mock()})
-    @patch('platform.platform', Mock(return_value='Linux-3.8.13-bone47-armv7l-with-debian-7.4'))
+    @patch('Adafruit_GPIO.Platform.platform_detect', Mock(return_value=Platform.BEAGLEBONE_BLACK))
     def test_beagleboneblack(self):
         pwm = PWM.get_platform_pwm()
         self.assertIsInstance(pwm, PWM.BBIO_PWM_Adapter)
 
-    @patch('platform.platform', Mock(return_value='Darwin-13.2.0-x86_64-i386-64bit'))
+    @patch('Adafruit_GPIO.Platform.platform_detect', Mock(return_value=Platform.UNKNOWN))
     def test_otherplatform(self):
         self.assertRaises(RuntimeError, PWM.get_platform_pwm)

test/test_GPIO.py tests/test_GPIO.py

@@ -26,11 +26,6 @@
 
 
 class TestPlatformDetect(unittest.TestCase):
-    @patch('platform.platform', Mock(return_value='Linux-3.10.25+-armv6l-with-debian-7.4'))
-    def test_raspberry_pi(self):
-        result = Platform.platform_detect()
-        self.assertEquals(result, Platform.RASPBERRY_PI)
-
     @patch('platform.platform', Mock(return_value='Linux-3.8.13-bone47-armv7l-with-debian-7.4'))
     def test_beaglebone_black(self):
         result = Platform.platform_detect()