diff --git a/ufo/gluster/swift/common/Glusterfs.py b/ufo/gluster/swift/common/Glusterfs.py
index 460956add..6cbdf6c35 100644
--- a/ufo/gluster/swift/common/Glusterfs.py
+++ b/ufo/gluster/swift/common/Glusterfs.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import logging
-import os, fcntl, time
+import os, sys, fcntl, time, errno
 from ConfigParser import ConfigParser, NoSectionError, NoOptionError
 from swift.common.utils import TRUE_VALUES, search_tree
 from gluster.swift.common.fs_utils import mkdirs
@@ -81,7 +81,8 @@ def mount(root, drive):
             fcntl.lockf(f, fcntl.LOCK_EX|fcntl.LOCK_NB)
         except:
             ex = sys.exc_info()[1]
-            if isinstance(ex, IOError) and ex.errno in (EACCES, EAGAIN):
+            if isinstance(ex, IOError) and ex.errno in \
+                    (errno.EACCES, errno.EAGAIN):
                 # This means that some other process is mounting the
                 # filesystem, so wait for the mount process to complete
                 return _busy_wait(full_mount_path)
diff --git a/ufo/test/unit/common/test_Glusterfs.py b/ufo/test/unit/common/test_Glusterfs.py
new file mode 100644
index 000000000..7de060aef
--- /dev/null
+++ b/ufo/test/unit/common/test_Glusterfs.py
@@ -0,0 +1,95 @@
+# Copyright (c) 2013 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import unittest
+import os, fcntl, errno, shutil
+from tempfile import mkdtemp
+import gluster.swift.common.Glusterfs as gfs
+
+def mock_os_path_ismount(path):
+    return True
+
+def mock_get_export_list():
+    return ['test', 'test2']
+
+def mock_os_system(cmd):
+    return False
+
+def mock_fcntl_lockf(f, *a, **kw):
+    raise IOError(errno.EAGAIN)
+
+def _init():
+    global _RUN_DIR, _OS_SYSTEM, _FCNTL_LOCKF
+    global _OS_PATH_ISMOUNT, __GET_EXPORT_LIST
+
+    _RUN_DIR          = gfs.RUN_DIR
+    _OS_SYSTEM        = os.system
+    _FCNTL_LOCKF      = fcntl.lockf
+    _OS_PATH_ISMOUNT  = os.path.ismount
+    __GET_EXPORT_LIST = gfs._get_export_list
+
+def _init_mock_variables(tmpdir):
+    os.system            = mock_os_system
+    os.path.ismount      = mock_os_path_ismount
+    gfs.RUN_DIR          = os.path.join(tmpdir, 'var/run/swift')
+    gfs._get_export_list = mock_get_export_list
+
+def _reset_mock_variables():
+    gfs.RUN_DIR          = _RUN_DIR
+    gfs._get_export_list = __GET_EXPORT_LIST
+
+    os.system       = _OS_SYSTEM
+    fcntl.lockf     = _FCNTL_LOCKF
+    os.path.ismount = _OS_PATH_ISMOUNT
+
+class TestGlusterfs(unittest.TestCase):
+    """ Tests for common.GlusterFS """
+
+    def setUp(self):
+        _init()
+
+    def test_mount(self):
+        try:
+            tmpdir = mkdtemp()
+            root   = os.path.join(tmpdir, 'mnt/gluster-object')
+            drive  = 'test'
+
+            _init_mock_variables(tmpdir)
+            assert gfs.mount(root, drive)
+        finally:
+            _reset_mock_variables()
+            shutil.rmtree(tmpdir)
+
+    def test_mount_egain(self):
+        try:
+            tmpdir = mkdtemp()
+            root   = os.path.join(tmpdir, 'mnt/gluster-object')
+            drive  = 'test'
+
+            _init_mock_variables(tmpdir)
+            assert gfs.mount(root, drive)
+            fcntl.lockf  = mock_fcntl_lockf
+            assert gfs.mount(root, drive)
+        finally:
+            _reset_mock_variables()
+            shutil.rmtree(tmpdir)
+
+    def test_mount_get_export_list_err(self):
+        gfs._get_export_list = mock_get_export_list
+        assert not gfs.mount(None, 'drive')
+        _reset_mock_variables()
+
+    def tearDown(self):
+        _reset_mock_variables()