Changeset 196 for cleverbox/trunk

Timestamp:

08/17/07 08:15:58 (5 years ago)

Author:

trivoallan

Message:

cleverbox :

• added client unit tests
• whitespace fixes

Location:

cleverbox/trunk/cleverbox

Files:

• client.py (modified) (2 diffs)
• environment.py (modified) (1 diff)
• tests/client.py (modified) (1 diff)
• utils/filesystem.py (modified) (1 diff)

cleverbox/trunk/cleverbox/client.py

@@ -70 +70 @@
     collected_infos['home_dir'] = os.path.join(environment.config.get('general', 'clients_root'), client_name)
     client_dir = collected_infos['home_dir']
-
-    # A few checks before effectively creating client
-    # -- homedir
-#    parent_dir = os.path.normpath(os.path.join(collected_infos['home_dir'], os.pardir))
-#    dir_is_ok = os.access(parent_dir, os.W_OK) and os.access(collected_infos['home_dir'], os.R_OK)
-#    print parent_dir
-#    if not dir_is_ok:
-#        raise os.error, "Directory %s is not writable or already exists, aborting." % collected_infos['home_dir']
 
     # Client creation
@@ -106 +98 @@
     logging.info("  Apache configuration written to %s\n" % apache_conf_filepath)
 
-    # -- Fix permissions
+    # -- Set permissions
     user  = environment.config.get('general', 'ssh_user')
     group = environment.config.get('general', 'apache_group')

cleverbox/trunk/cleverbox/environment.py

@@ -25 +25 @@
 
         #Parameters sanity check
-        try:
+        try:
            parameters['general']['assets_dir']
-           parameters['general']['apache_group']
-           parameters['general']['clients_root']
-        except KeyError, e:
-           raise Exception, "Supplied parameters are not complete."
+           parameters['general']['apache_group']
+           parameters['general']['clients_root']
+        except KeyError, e:
+            raise Exception, "Supplied parameters are not complete."
 
         # Do not do anything if base directories is not empty

cleverbox/trunk/cleverbox/tests/client.py

@@ -39 +39 @@
 
     def test_client_add_generates_expected_apache_configuration(self):
-        pass
+        client_name = 'testclient'
+        client.add(self.env, client_name) 
+        expected =  """
+# -- Include enabled projects configuration files
+Include %(env_dir)s/projects-enabled/testclient-*
+""" % {'env_dir' : self.env.path}
+        got = file(os.path.join(self.env.path, 'clients-available', client_name)).read()
+        
+        assert got == expected, "client.add() generates expected apache configuration fragment (expected %s, got %s)" % (expected, got)
     
     def test_client_add_fails_on_existing_client(self):
-        pass
+        """
+        client.add() fails when given already existing client.
+        """
+        client_name = 'testclient'
+        client.add(self.env, client_name)
+        try: 
+            client.add(self.env, client_name + 'f')
+        except Exception, e:
+            pass
+        else:
+            self.fail(__doc__)
     
     def test_client_add_fails_on_invalid_client_name(self):
-        pass
+        client_name = 'test-client'
+        try:
+            client.add(self.env, client_name)
+        except Exception, e:
+            pass
+        else:
+            self.fail("client.add() fails when given invalid username")
 
 

cleverbox/trunk/cleverbox/utils/filesystem.py

@@ -59 +59 @@
    return stat.S_ISLNK(mode)
 
+def set_permissions(permissions):
+    for (entry, spec) in permissions.items():
+        os.chmod(entry, spec[0])
+        os.chown(entry,
+                 get_uid_from_name(spec[1]),
+                 get_gid_from_name(spec[2]))