Merge branch 'release/0.1.3'

CANDY-LINE · Jul 22, 2016 · 4373a29 · 4373a29
2 parents 7f58159 + 0eb94cb
commit 4373a29
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ $ ./setup.py test
 
 # Revision history
 
- * 0.1.1-0.1.2
+ * 0.1.1-0.1.3
    - Fix resolve_modem_port()
 
  * 0.1.0

diff --git a/lib/candy_board_amt/__init__.py b/lib/candy_board_amt/__init__.py
@@ -132,9 +132,12 @@ def resolve_modem_port():
                 if ret is None:
                     port.close()
                     continue
-                ret = port.read_line()
-                if ret == "OK":
-                    return p
+                while ret is not None:
+                    ret = port.read_line()
+                    if ret == "OK":
+                        port.close()
+                        return p
+
         return None
 
 class SockServer(threading.Thread):

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 from setuptools import setup, find_packages
 from setuptools.command.test import test as TestCommand
 
-version = "0.1.2"
+version = "0.1.3"
 
 class PyTest(TestCommand):
     def finalize_options(self):
@@ -50,7 +50,7 @@ def run_tests(self):
         'CANDY EGG', 'CANDY LINE'
     ),
     tests_require=['pytest-cov>=2.2.0',
-                   'pytest>=2.8.2',
+                   'pytest>=2.6.4',
                    'terminaltables>=1.2.1'],
     cmdclass = {'test': PyTest}
 )