summaryrefslogtreecommitdiffstats
path: root/ufo/test/unit/common/data
diff options
context:
space:
mode:
authorPeter Portante <peter.portante@redhat.com>2013-04-04 13:08:32 -0400
committerAnand Avati <avati@redhat.com>2013-04-05 11:20:37 -0700
commit6a7d28c0f8c107baf376eceb9fc05d9e80bf74e5 (patch)
tree05adcb9cfab21adca87401032df6222239ef74d5 /ufo/test/unit/common/data
parenta56dca94c3b174637074be46e9a537ba0ca02c4b (diff)
object-storage: use tox for unit tests; fix em too
Add the ability to use tox for unit tests, since it helps us solve the problem of supporting multiple branches that require different versions of dependencies, and allows us to possibly support multiple versions of python in the future. Also fix the code to work with pre-grizzly environments, by not requiring the constraints backport. Also fixed the xattr support to work with both pyxattr and xattr modules. And fixed the ring tests to also work without a live /etc/swift directory. BUG: 948657 (https://bugzilla.redhat.com/show_bug.cgi?id=948657) Change-Id: I2be79c8ef8916bb6552ef957094f9186a963a068 Signed-off-by: Peter Portante <peter.portante@redhat.com> Reviewed-on: http://review.gluster.org/4781 Reviewed-by: Alex Wheeler <wheelear@gmail.com> Tested-by: Alex Wheeler <wheelear@gmail.com> Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'ufo/test/unit/common/data')
-rw-r--r--ufo/test/unit/common/data/README.rings3
-rw-r--r--ufo/test/unit/common/data/account.builderbin0 -> 537 bytes
-rw-r--r--ufo/test/unit/common/data/account.ring.gzbin0 -> 183 bytes
-rw-r--r--ufo/test/unit/common/data/backups/1365124498.account.builderbin0 -> 537 bytes
-rw-r--r--ufo/test/unit/common/data/backups/1365124498.container.builderbin0 -> 537 bytes
-rw-r--r--ufo/test/unit/common/data/backups/1365124498.object.builderbin0 -> 228 bytes
-rw-r--r--ufo/test/unit/common/data/backups/1365124499.object.builderbin0 -> 537 bytes
-rw-r--r--ufo/test/unit/common/data/container.builderbin0 -> 537 bytes
-rw-r--r--ufo/test/unit/common/data/container.ring.gzbin0 -> 185 bytes
-rw-r--r--ufo/test/unit/common/data/object.builderbin0 -> 537 bytes
-rw-r--r--ufo/test/unit/common/data/object.ring.gzbin0 -> 182 bytes
11 files changed, 3 insertions, 0 deletions
diff --git a/ufo/test/unit/common/data/README.rings b/ufo/test/unit/common/data/README.rings
new file mode 100644
index 00000000000..6457501fb38
--- /dev/null
+++ b/ufo/test/unit/common/data/README.rings
@@ -0,0 +1,3 @@
+The unit tests expect certain ring data built using the following command:
+
+ ../../../../bin/gluster-swift-gen-builders test iops \ No newline at end of file
diff --git a/ufo/test/unit/common/data/account.builder b/ufo/test/unit/common/data/account.builder
new file mode 100644
index 00000000000..090ba4b74ff
--- /dev/null
+++ b/ufo/test/unit/common/data/account.builder
Binary files differ
diff --git a/ufo/test/unit/common/data/account.ring.gz b/ufo/test/unit/common/data/account.ring.gz
new file mode 100644
index 00000000000..6d4c8547437
--- /dev/null
+++ b/ufo/test/unit/common/data/account.ring.gz
Binary files differ
diff --git a/ufo/test/unit/common/data/backups/1365124498.account.builder b/ufo/test/unit/common/data/backups/1365124498.account.builder
new file mode 100644
index 00000000000..090ba4b74ff
--- /dev/null
+++ b/ufo/test/unit/common/data/backups/1365124498.account.builder
Binary files differ
diff --git a/ufo/test/unit/common/data/backups/1365124498.container.builder b/ufo/test/unit/common/data/backups/1365124498.container.builder
new file mode 100644
index 00000000000..733d27dd9e3
--- /dev/null
+++ b/ufo/test/unit/common/data/backups/1365124498.container.builder
Binary files differ
diff --git a/ufo/test/unit/common/data/backups/1365124498.object.builder b/ufo/test/unit/common/data/backups/1365124498.object.builder
new file mode 100644
index 00000000000..ff877ec957d
--- /dev/null
+++ b/ufo/test/unit/common/data/backups/1365124498.object.builder
Binary files differ
diff --git a/ufo/test/unit/common/data/backups/1365124499.object.builder b/ufo/test/unit/common/data/backups/1365124499.object.builder
new file mode 100644
index 00000000000..8b8cd6c1e34
--- /dev/null
+++ b/ufo/test/unit/common/data/backups/1365124499.object.builder
Binary files differ
diff --git a/ufo/test/unit/common/data/container.builder b/ufo/test/unit/common/data/container.builder
new file mode 100644
index 00000000000..733d27dd9e3
--- /dev/null
+++ b/ufo/test/unit/common/data/container.builder
Binary files differ
diff --git a/ufo/test/unit/common/data/container.ring.gz b/ufo/test/unit/common/data/container.ring.gz
new file mode 100644
index 00000000000..592b84bab9f
--- /dev/null
+++ b/ufo/test/unit/common/data/container.ring.gz
Binary files differ
diff --git a/ufo/test/unit/common/data/object.builder b/ufo/test/unit/common/data/object.builder
new file mode 100644
index 00000000000..8b8cd6c1e34
--- /dev/null
+++ b/ufo/test/unit/common/data/object.builder
Binary files differ
diff --git a/ufo/test/unit/common/data/object.ring.gz b/ufo/test/unit/common/data/object.ring.gz
new file mode 100644
index 00000000000..d2f7192b6ce
--- /dev/null
+++ b/ufo/test/unit/common/data/object.ring.gz
Binary files differ