Rebase to lastest OpenStack Swift DiskFile API

As of October 28th, 2013, we rebase to OpenStack Swift master (commit
4bfe674) to pick up the lastest officially supported DiskFile API
changes. We use a snapshot of OpenStack Swift stored in the
gluster-swift launchpad downloads area so that we can deliberately
rebase at our own pace.

With this refactoring, all the code for handling I/O is wholly
contained in the swift tree for object operations. This will allow us
to use a different fs_utils implementation in the future (for example,
one based on a yet-to-be-implemented python bindings over libgfapi).
This also means the "Fake_file" class has been removed entirely.

Change-Id: I767983f88c59786e30b6c64da16d1cb6ab3c3e7f
Signed-off-by: Peter Portante <peter.portante@redhat.com>
Reviewed-on: http://review.gluster.org/5993
Reviewed-by: Luis Pabon <lpabon@redhat.com>
Tested-by: Luis Pabon <lpabon@redhat.com>

1 files changed, 12 insertions, 47 deletions

diff --git a/test/unit/common/test_utils.py b/test/unit/common/test_utils.py
index 72d62d0..4d345da 100644
--- a/test/unit/common/test_utils.py
+++ b/test/unit/common/test_utils.py
@@ -26,7 +26,6 @@ import tarfile
 import shutil
 from collections import defaultdict
 from mock import patch
-from swift.common.utils import normalize_timestamp
 from gluster.swift.common import utils, Glusterfs
 from gluster.swift.common.exceptions import GlusterFileSystemOSError
 
@@ -368,7 +367,7 @@ class TestUtils(unittest.TestCase):
         assert md[utils.X_OBJECT_TYPE] == utils.FILE
         assert md[utils.X_CONTENT_TYPE] == utils.FILE_TYPE
         assert md[utils.X_CONTENT_LENGTH] == os.path.getsize(tf.name)
-        assert md[utils.X_TIMESTAMP] == normalize_timestamp(os.path.getctime(tf.name))
+        assert md[utils.X_TIMESTAMP] == utils.normalize_timestamp(os.path.getctime(tf.name))
         assert md[utils.X_ETAG] == utils._get_etag(tf.name)
 
     def test_get_object_metadata_dir(self):
@@ -381,7 +380,7 @@ class TestUtils(unittest.TestCase):
             assert md[utils.X_OBJECT_TYPE] == utils.DIR_NON_OBJECT
             assert md[utils.X_CONTENT_TYPE] == utils.DIR_TYPE
             assert md[utils.X_CONTENT_LENGTH] == 0
-            assert md[utils.X_TIMESTAMP] == normalize_timestamp(os.path.getctime(td))
+            assert md[utils.X_TIMESTAMP] == utils.normalize_timestamp(os.path.getctime(td))
             assert md[utils.X_ETAG] == hashlib.md5().hexdigest()
         finally:
             os.rmdir(td)
@@ -406,7 +405,7 @@ class TestUtils(unittest.TestCase):
         assert md[utils.X_OBJECT_TYPE] == utils.FILE
         assert md[utils.X_CONTENT_TYPE] == utils.FILE_TYPE
         assert md[utils.X_CONTENT_LENGTH] == os.path.getsize(tf.name)
-        assert md[utils.X_TIMESTAMP] == normalize_timestamp(os.path.getctime(tf.name))
+        assert md[utils.X_TIMESTAMP] == utils.normalize_timestamp(os.path.getctime(tf.name))
         assert md[utils.X_ETAG] == utils._get_etag(tf.name)
 
     def test_create_object_metadata_dir(self):
@@ -428,7 +427,7 @@ class TestUtils(unittest.TestCase):
             assert md[utils.X_OBJECT_TYPE] == utils.DIR_NON_OBJECT
             assert md[utils.X_CONTENT_TYPE] == utils.DIR_TYPE
             assert md[utils.X_CONTENT_LENGTH] == 0
-            assert md[utils.X_TIMESTAMP] == normalize_timestamp(os.path.getctime(td))
+            assert md[utils.X_TIMESTAMP] == utils.normalize_timestamp(os.path.getctime(td))
             assert md[utils.X_ETAG] == hashlib.md5().hexdigest()
         finally:
             os.rmdir(td)
@@ -445,8 +444,8 @@ class TestUtils(unittest.TestCase):
         try:
             exp_md = {
                 utils.X_TYPE: (utils.CONTAINER, 0),
-                utils.X_TIMESTAMP: (normalize_timestamp(os.path.getctime(td)), 0),
-                utils.X_PUT_TIMESTAMP: (normalize_timestamp(os.path.getmtime(td)), 0),
+                utils.X_TIMESTAMP: (utils.normalize_timestamp(os.path.getctime(td)), 0),
+                utils.X_PUT_TIMESTAMP: (utils.normalize_timestamp(os.path.getmtime(td)), 0),
                 utils.X_OBJECTS_COUNT: (3, 0),
                 utils.X_BYTES_USED: (47, 0),
             }
@@ -467,8 +466,8 @@ class TestUtils(unittest.TestCase):
         try:
             exp_md = {
                 utils.X_TYPE: (utils.ACCOUNT, 0),
-                utils.X_TIMESTAMP: (normalize_timestamp(os.path.getctime(td)), 0),
-                utils.X_PUT_TIMESTAMP: (normalize_timestamp(os.path.getmtime(td)), 0),
+                utils.X_TIMESTAMP: (utils.normalize_timestamp(os.path.getctime(td)), 0),
+                utils.X_PUT_TIMESTAMP: (utils.normalize_timestamp(os.path.getmtime(td)), 0),
                 utils.X_OBJECTS_COUNT: (0, 0),
                 utils.X_BYTES_USED: (0, 0),
                 utils.X_CONTAINER_COUNT: (2, 0),
@@ -498,8 +497,8 @@ class TestUtils(unittest.TestCase):
             for key in self.cont_keys:
                 assert key in md, "Expected key %s in %r" % (key, md)
             assert md[utils.X_TYPE] == (utils.CONTAINER, 0)
-            assert md[utils.X_TIMESTAMP] == (normalize_timestamp(os.path.getctime(td)), 0)
-            assert md[utils.X_PUT_TIMESTAMP] == (normalize_timestamp(os.path.getmtime(td)), 0)
+            assert md[utils.X_TIMESTAMP] == (utils.normalize_timestamp(os.path.getctime(td)), 0)
+            assert md[utils.X_PUT_TIMESTAMP] == (utils.normalize_timestamp(os.path.getmtime(td)), 0)
             assert md[utils.X_OBJECTS_COUNT] == (0, 0)
             assert md[utils.X_BYTES_USED] == (0, 0)
         finally:
@@ -524,8 +523,8 @@ class TestUtils(unittest.TestCase):
             for key in self.acct_keys:
                 assert key in md, "Expected key %s in %r" % (key, md)
             assert md[utils.X_TYPE] == (utils.ACCOUNT, 0)
-            assert md[utils.X_TIMESTAMP] == (normalize_timestamp(os.path.getctime(td)), 0)
-            assert md[utils.X_PUT_TIMESTAMP] == (normalize_timestamp(os.path.getmtime(td)), 0)
+            assert md[utils.X_TIMESTAMP] == (utils.normalize_timestamp(os.path.getctime(td)), 0)
+            assert md[utils.X_PUT_TIMESTAMP] == (utils.normalize_timestamp(os.path.getmtime(td)), 0)
             assert md[utils.X_OBJECTS_COUNT] == (0, 0)
             assert md[utils.X_BYTES_USED] == (0, 0)
             assert md[utils.X_CONTAINER_COUNT] == (0, 0)
@@ -608,40 +607,6 @@ class TestUtils(unittest.TestCase):
             os.chdir(orig_cwd)
             shutil.rmtree(td)
 
-    def test_write_pickle(self):
-        td = tempfile.mkdtemp()
-        try:
-            fpp = os.path.join(td, 'pp')
-            # FIXME: Remove this patch when coverage.py can handle eventlet
-            with patch("os.fsync", _mock_os_fsync):
-                utils.write_pickle('pickled peppers', fpp)
-            with open(fpp, "rb") as f:
-                contents = f.read()
-            s = pickle.loads(contents)
-            assert s == 'pickled peppers', repr(s)
-        finally:
-            shutil.rmtree(td)
-
-    def test_write_pickle_ignore_tmp(self):
-        tf = tempfile.NamedTemporaryFile()
-        td = tempfile.mkdtemp()
-        try:
-            fpp = os.path.join(td, 'pp')
-            # Also test an explicity pickle protocol
-            # FIXME: Remove this patch when coverage.py can handle eventlet
-            with patch("os.fsync", _mock_os_fsync):
-                utils.write_pickle('pickled peppers', fpp, tmp=tf.name,
-                                   pickle_protocol=2)
-            with open(fpp, "rb") as f:
-                contents = f.read()
-            s = pickle.loads(contents)
-            assert s == 'pickled peppers', repr(s)
-            with open(tf.name, "rb") as f:
-                contents = f.read()
-            assert contents == ''
-        finally:
-            shutil.rmtree(td)
-
     def test_check_user_xattr_bad_path(self):
         assert False == utils.check_user_xattr("/tmp/foo/bar/check/user/xattr")