diff options
Diffstat (limited to 'swift/1.4.8/test/unit')
| -rw-r--r-- | swift/1.4.8/test/unit/common/__init__.py (renamed from swift/1.4.8/test/unit/plugins/__init__.py) | 0 | ||||
| -rw-r--r-- | swift/1.4.8/test/unit/common/data/account_tree.tar.bz2 (renamed from swift/1.4.8/test/unit/plugins/data/account_tree.tar.bz2) | bin | 228 -> 228 bytes | |||
| -rw-r--r-- | swift/1.4.8/test/unit/common/data/container_tree.tar.bz2 (renamed from swift/1.4.8/test/unit/plugins/data/container_tree.tar.bz2) | bin | 282 -> 282 bytes | |||
| -rw-r--r-- | swift/1.4.8/test/unit/common/test_utils.py (renamed from swift/1.4.8/test/unit/plugins/test_utils.py) | 10 |
4 files changed, 5 insertions, 5 deletions
diff --git a/swift/1.4.8/test/unit/plugins/__init__.py b/swift/1.4.8/test/unit/common/__init__.py index e69de29bb..e69de29bb 100644 --- a/swift/1.4.8/test/unit/plugins/__init__.py +++ b/swift/1.4.8/test/unit/common/__init__.py diff --git a/swift/1.4.8/test/unit/plugins/data/account_tree.tar.bz2 b/swift/1.4.8/test/unit/common/data/account_tree.tar.bz2 Binary files differindex cb23e4dd7..cb23e4dd7 100644 --- a/swift/1.4.8/test/unit/plugins/data/account_tree.tar.bz2 +++ b/swift/1.4.8/test/unit/common/data/account_tree.tar.bz2 diff --git a/swift/1.4.8/test/unit/plugins/data/container_tree.tar.bz2 b/swift/1.4.8/test/unit/common/data/container_tree.tar.bz2 Binary files differindex b4a149285..b4a149285 100644 --- a/swift/1.4.8/test/unit/plugins/data/container_tree.tar.bz2 +++ b/swift/1.4.8/test/unit/common/data/container_tree.tar.bz2 diff --git a/swift/1.4.8/test/unit/plugins/test_utils.py b/swift/1.4.8/test/unit/common/test_utils.py index 92c7ff005..ec66324a0 100644 --- a/swift/1.4.8/test/unit/plugins/test_utils.py +++ b/swift/1.4.8/test/unit/common/test_utils.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -""" Tests for plugins.utils """ +""" Tests for common.utils """ import os import unittest @@ -26,7 +26,7 @@ import tarfile import shutil from collections import defaultdict from swift.common.utils import normalize_timestamp -from swift.plugins import utils +from gluster.swift.common import utils # # Somewhat hacky way of emulating the operation of xattr calls. They are made @@ -119,7 +119,7 @@ class SimMemcache(object): class TestUtils(unittest.TestCase): - """ Tests for plugins.utils """ + """ Tests for common.utils """ def setUp(self): _initxattr() @@ -753,7 +753,7 @@ class TestUtils(unittest.TestCase): def test_get_container_details_from_fs(self): td = tempfile.mkdtemp() - tf = tarfile.open("plugins/data/account_tree.tar.bz2", "r:bz2") + tf = tarfile.open("common/data/account_tree.tar.bz2", "r:bz2") orig_cwd = os.getcwd() os.chdir(td) tf.extractall() @@ -776,7 +776,7 @@ class TestUtils(unittest.TestCase): def test_get_account_details_from_fs(self): td = tempfile.mkdtemp() - tf = tarfile.open("plugins/data/container_tree.tar.bz2", "r:bz2") + tf = tarfile.open("common/data/container_tree.tar.bz2", "r:bz2") orig_cwd = os.getcwd() os.chdir(td) tf.extractall() |