Merge tag 'v0.10.2' into baserock/morphbaserock/morph

v0.10 post-release tag for pyinstaller support

1 files changed, 12 insertions, 3 deletions

diff --git a/cxmanage_test/tftp_test.py b/cxmanage_test/tftp_test.py
index 784211a..afd258f 100644
--- a/cxmanage_test/tftp_test.py
+++ b/cxmanage_test/tftp_test.py
@@ -1,4 +1,7 @@
-# Copyright (c) 2012, Calxeda Inc.
+"""Calxeda: tftp_test.py"""
+
+
+# Copyright (c) 2012-2013, Calxeda Inc.
 #
 # All rights reserved.
 #
@@ -27,7 +30,11 @@
 # TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 # DAMAGE.
-"""Unit tests for the Internal and External Tftp classes."""
+
+
+#
+# Unit tests for the Internal and External Tftp classes.
+#
 
 
 import os
@@ -51,6 +58,7 @@ def _get_relative_host():
     except socket.error:
         raise
 
+# pylint: disable=R0904
 class InternalTftpTest(unittest.TestCase):
     """ Tests the functions of the InternalTftp class."""
 
@@ -79,7 +87,7 @@ class InternalTftpTest(unittest.TestCase):
         self.assertEqual(open(filename).read(), contents)
         os.remove(filename)
 
-    def test_get_address_with_relative_host(self):
+    def test_get_address_with_relhost(self):
         """Tests the get_address(relative_host) function with a relative_host
         specified.
         """
@@ -97,6 +105,7 @@ class InternalTftpTest(unittest.TestCase):
         sock.close()
 
 
+# pylint: disable=R0904
 class ExternalTftpTest(unittest.TestCase):
     """Tests the ExternalTftp class.
     ..note: