Changeset 3985

Timestamp:

02/12/09 01:48:01 (4 years ago)

Author:

getxsick

Message:

* tests: added a test which check if all directories in .umpa are created

correctly (if .umpa exists!).
it's commented, see comment why

* fixed the bug related to this test

Location:

branch/UMPA

Files:

• tests/unit/test_init.py (modified) (1 diff)
• umpa/__init__.py (modified) (1 diff)

branch/UMPA/tests/unit/test_init.py

@@ -32 +32 @@
         cls.tmp_dir = tempfile.mkdtemp()
         os.path.expanduser = expanduser
+        # TODO: make a test for commented lines but clean .umpa and
+        # re-import umpa after creating dirs
+        #os.makedirs(os.path.join(cls.tmp_dir, '.umpa'))
+        #os.makedirs(os.path.join(cls.tmp_dir, '.umpa', 'umpa_plugins',
+        #                                                       'protocols'))
         import umpa
 

branch/UMPA/umpa/__init__.py

@@ -48 +48 @@
 local_path = os.path.join(os.path.expanduser('~'), '.umpa')
 
-# checking if local directory exists
-if not os.path.isdir(local_path):
-    os.makedirs(os.path.join(local_path, 'umpa_plugins', 'protocols'))
-    os.mkdir(os.path.join(local_path, 'umpa_plugins', 'extensions'))
+for dir in ('protocols', 'extensions'):
+    try:
+        os.makedirs(os.path.join(local_path, 'umpa_plugins', dir))
+    except OSError, err:
+        if err.errno != 17:     # skip if dir exists
+            raise
 
 # to allow things like: from umpa_plugins.extensions import something