Reorganized the tests.

Once the tests are growing up, I decided to organize it in a clean way.

test_libnetworkcache  - tests to NetworkcacheClient class
test_signature        - tests to signature script
libnetworkcachemixin  - an util module with all the code which is
                        required to setup the test environment

NOTE: THERE IS NO CODE CHANGE.

setup.py

@@ -47,5 +47,5 @@ setup(
     zip_safe=True,
     packages=find_packages(),
     namespace_packages=['slapos'],
-    test_suite="slapos.libnetworkcachetests"
+    test_suite="slapos.tests",
     )

slapos/tests/libnetworkcachemixin.py

+##############################################################################
+#
+# Copyright (c) 2010 ViFiB SARL and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+
+import tempfile
+import unittest
+from slapos.signature import parseArgument, \
+                             createPrivateKeyAndCertificateFile
+
+
+class LibNetworkCacheMixin(unittest.TestCase):
+
+  def setUp(self):
+    """ Setup the test. """
+    self.pub_file_descriptor = tempfile.NamedTemporaryFile()
+    self.priv_file_descritor = tempfile.NamedTemporaryFile()
+    self.signature_certificate_file = self.pub_file_descriptor.name
+    self.signature_private_key_file = self.priv_file_descritor.name
+    self.signature_creation_argument_list = \
+        ('--signature-certificate-file', self.signature_certificate_file,
+         '--signature-private-key-file', self.signature_private_key_file,
+         '--country', 'BR',
+         '--state-name', 'Campos',
+         '--locality-name', 'Rio de Janeiro',
+         '--organization-name', 'Nexedi',
+         '--organization-unit-name', 'Dev',
+         '--common-name', 'R500.com',
+         '--email', 'test@example.com')
+    self.option_dict = parseArgument(*self.signature_creation_argument_list)
+    self.cert_as_text = createPrivateKeyAndCertificateFile(**self.option_dict)
+
+  def tearDown(self):
+    """ Remove the files which have been created during the test. """
+    self.priv_file_descritor.close()
+    self.pub_file_descriptor.close()

slapos/libnetworkcachetests.py → slapos/tests/test_libnetworkcache.py

+##############################################################################
+#
+# Copyright (c) 2010 ViFiB SARL and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+
+
 import unittest
 import tempfile
-import os
 from slapos.libnetworkcache import NetworkcacheClient
-from slapos.signature import parseArgument, \
-                             createPrivateKeyAndCertificateFile
+from slapos.tests.libnetworkcachemixin import LibNetworkCacheMixin
+
 
 class OfflineTest(unittest.TestCase):
   def test_download_offline(self):
@@ -15,73 +29,6 @@ class OfflineTest(unittest.TestCase):
     nc = NetworkcacheClient('http://127.0.0.1:0', 'http://127.0.0.1:0')
     self.assertRaises(IOError, nc.upload, content)
 
-class LibNetworkCacheMixin(unittest.TestCase):
-
-  def setUp(self):
-    ''' Setup the test. '''
-    self.pub_file_descriptor = tempfile.NamedTemporaryFile()
-    self.priv_file_descritor = tempfile.NamedTemporaryFile()
-    self.signature_certificate_file = self.pub_file_descriptor.name
-    self.signature_private_key_file = self.priv_file_descritor.name
-    self.signature_creation_argument_list = \
-        ('--signature-certificate-file', self.signature_certificate_file,
-         '--signature-private-key-file', self.signature_private_key_file,
-         '--country', 'BR',
-         '--state-name', 'Campos',
-         '--locality-name', 'Rio de Janeiro',
-         '--organization-name', 'Nexedi',
-         '--organization-unit-name', 'Dev',
-         '--common-name', 'R500.com',
-         '--email', 'test@example.com')
-    self.option_dict = parseArgument(*self.signature_creation_argument_list)
-    self.cert_as_text = createPrivateKeyAndCertificateFile(**self.option_dict)
-
-  def tearDown(self):
-    ''' Remove the files which have been created during the test. '''
-    self.priv_file_descritor.close()
-    self.pub_file_descriptor.close()
-
-
-class GenerateSignatureScriptTest(LibNetworkCacheMixin):
-  ''' Class which must test the signature.py script. '''
-
-  def test_parse_argument_with_empty_list(self):
-    '''
-      If the argument list is empty, then the parseArgument method should
-    return a dictionary with default argument values.
-    '''
-    default_dict = {'organization_name': 'Default Company Ltd',
-                    'state_name': 'Default Province',
-                    'organization_unit_name': '',
-                    'common_name': '',
-                    'country': 'XX',
-                    'locality_name': 'Default City',
-                    'signature_private_key_file': 'private.pem',
-                    'signature_certificate_file': 'public.pem',
-                    'email': ''}
-    self.assertEquals(default_dict, parseArgument())
-
-  def test_parse_argument(self):
-    '''
-      Check if the argument is properly set.
-    '''
-    size_argument_list = len(self.signature_creation_argument_list)/2
-    size_option_dict = len(self.option_dict)
-    self.assertEquals(size_argument_list, size_option_dict,
-        "Argument list should have the same size of option dict.")
-
-    # Assert if the values are equals.
-    for value in self.option_dict.values():
-      self.assertTrue(value in self.signature_creation_argument_list,\
-          '%s is not in %s.' % (value, self.signature_creation_argument_list))
-
-  def test_key_and_certificate_file_creation(self):
-    '''
-      Check if key file and the certificate file are being created correctly.
-    '''
-    self.assertTrue(os.path.exists(self.signature_certificate_file))
-    self.assertTrue(os.path.exists(self.signature_private_key_file))
-
 
 class TestNetworkcacheClient(LibNetworkCacheMixin):
   """
@@ -120,8 +67,8 @@ class TestNetworkcacheClient(LibNetworkCacheMixin):
 
   def test_signature_creation_without_private_key_file(self):
     """
-      Without the private key file, it is not possible to create the 
-      signature so it must 
+      Without the private key file, it is not possible to create the
+      signature so it must retun an empty string.
     """
     self.assertEquals('', self.nc._getSignatureString())
 
@@ -138,7 +85,7 @@ class TestNetworkcacheClient(LibNetworkCacheMixin):
   def test_verification_without_signature_certificate_file_list(self):
     """
       Without the signature certificate file list it is not possible to
-      verify if the signature if trusted or not.
+      verify if the signature is trusted or not.
       So, the _verifySignatureInCertificateList should return False.
     """
     nc = NetworkcacheClient(
@@ -192,7 +139,8 @@ class TestNetworkcacheClient(LibNetworkCacheMixin):
   def test_signature_verification_priority(self):
     """
       During the signature vefirication, the filesystem path has priority over
-      urls. So, if the public key is 
+      urls. It will only download the certificate from the url if the local
+      certificates are not valid.
     """
     nc = NetworkcacheClient(
              shacache=self.shacache_url,

slapos/tests/test_signature.py

+##############################################################################
+#
+# Copyright (c) 2010 ViFiB SARL and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+
+
+import os
+from slapos.tests.libnetworkcachemixin import LibNetworkCacheMixin
+from slapos.signature import parseArgument
+
+
+class GenerateSignatureScriptTest(LibNetworkCacheMixin):
+  """ Class which must test the signature.py script. """
+
+  def test_parse_argument_with_empty_list(self):
+    """
+      If the argument list is empty, then the parseArgument method should
+    return a dictionary with default argument values.
+    """
+    default_dict = {'organization_name': 'Default Company Ltd',
+                    'state_name': 'Default Province',
+                    'organization_unit_name': '',
+                    'common_name': '',
+                    'country': 'XX',
+                    'locality_name': 'Default City',
+                    'signature_private_key_file': 'private.pem',
+                    'signature_certificate_file': 'public.pem',
+                    'email': ''}
+    self.assertEquals(default_dict, parseArgument())
+
+  def test_parse_argument(self):
+    """
+      Check if the argument is properly set.
+    """
+    size_argument_list = len(self.signature_creation_argument_list) / 2
+    size_option_dict = len(self.option_dict)
+    self.assertEquals(size_argument_list, size_option_dict,
+        "Argument list should have the same size of option dict.")
+
+    # Assert if the values are equals.
+    for value in self.option_dict.values():
+      self.assertTrue(value in self.signature_creation_argument_list,\
+          '%s is not in %s.' % (value, self.signature_creation_argument_list))
+
+  def test_key_and_certificate_file_creation(self):
+    """
+      Check if key file and the certificate file are being created correctly.
+    """
+    self.assertTrue(os.path.exists(self.signature_certificate_file))
+    self.assertTrue(os.path.exists(self.signature_private_key_file))