clear key.version_id now that GET requests return x-amz-version-id header

Signed-off-by: Casey Bodley <cbodley@redhat.com>
Merge pull request #143 from mdw-at-linuxbox/ceph-master-setupfix
2017-06-16 13:04:33 -04:00 · 2017-01-26 11:08:31 -05:00 · 2017-01-26 04:27:35 -05:00 · 2017-01-25 16:33:17 -05:00 · 2016-04-12 08:29:02 -04:00
2 changed files with 17 additions and 5 deletions
--- a/19
+++ b/19
@ -12,9 +12,18 @@ if [ -f /etc/debian_version ]; then
        echo "$0: missing required DEB packages. Installing via sudo." 1>&2
        sudo apt-get -y install $missing
    fi
-fi
-if [ -f /etc/redhat-release ]; then
-    for package in python-pip python-virtualenv python-devel libevent-devel; do
+elif [ -f /etc/fedora-release ]; then
+    for package in python-pip python2-virtualenv python-devel libevent-devel; do
+        if [ "$(rpm -qa $package 2>/dev/null)" == "" ]; then
+            missing="${missing:+$missing }$package"
+        fi
+    done
+    if [ -n "$missing" ]; then
+        echo "$0: missing required RPM packages. Installing via sudo." 1>&2
+        sudo yum -y install $missing
+    fi
+elif [ -f /etc/redhat-release ]; then
+    for package in python2-pip python-virtualenv python-devel libevent-devel; do
        if [ "$(rpm -qa $package 2>/dev/null)" == "" ]; then
            missing="${missing:+$missing }$package"
        fi
@ -30,8 +39,8 @@ virtualenv --no-site-packages --distribute virtualenv
 # avoid pip bugs
 ./virtualenv/bin/pip install --upgrade pip

-# work-around change in pip 1.5
-./virtualenv/bin/pip install setuptools --no-use-wheel --upgrade
+# slightly old version of setuptools; newer fails w/ requests 0.14.0
+./virtualenv/bin/pip install setuptools==32.3.1

 ./virtualenv/bin/pip install -r requirements.txt

--- a/s3tests/functional/test_s3.py
+++ b/s3tests/functional/test_s3.py
@ -1012,6 +1012,7 @@ def test_multi_object_delete():
@attr(method='put')
@attr(operation='write zero-byte key')
@attr(assertion='correct content length')
+@attr('fails_on_rgw')   # actually, just apache; works with civetweb.
 def test_object_head_zero_bytes():
    bucket = get_new_bucket()
    key = bucket.new_key('foo')
@ -6293,6 +6294,8 @@ def test_versioning_obj_plain_null_version_overwrite():
    key.set_contents_from_string(content2)

    eq(key.get_contents_as_string(), content2)
+    # get_contents_to_string() will set key.version_id, clear it
+    key.version_id = None

    version_id = None
    for k in bucket.list_versions():
Author	SHA1	Message	Date
Casey Bodley	4c6d0569b3	clear key.version_id now that GET requests return x-amz-version-id header Signed-off-by: Casey Bodley <cbodley@redhat.com>	2017-06-16 13:04:33 -04:00
Matt Benjamin	cab30ee8ab	Merge pull request #143 from mdw-at-linuxbox/ceph-master-setupfix Use non-broken version of setuptools, and fix bootstrap to be more po…	2017-01-26 11:08:31 -05:00
Marcus Watts	e85c6f3dda	Use non-broken version of setuptools, and fix bootstrap to be more portable. Most recent version of setuptools breaks when asked to load requests 0.14.0. symptom, complains about not being able to import filterfalse thus: from six.moves import map, filter, filterfalse this comes from setuptools, and older versions of setuptools don't have this problem. Various versions of centos7 and fedora have interesting names for packages, centos7: python-pip is python2-pip fedora24: python-virtualenv is python2-virtualenv This is somewhat masked by using sudo yum: if the actual package ,s installed, rpm knows that the capability is there and does nothing. But, if the package isn't there, or you haven't chosen to set up sudo to work that way, this does not work. Signed-off-by: Marcus Watts <mwatts@redhat.com> (cherry picked from commit `ddc150439d`)	2017-01-26 04:27:35 -05:00
Matt Benjamin	5562bd6143	bootstrap: force new setuptools Deal setuptools upgrade problem discussed here: https://github.com/pypa/setuptools/issues/940 Now follows the same formula as upstream teuthology. Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>	2017-01-25 16:33:17 -05:00
Sage Weil	dfc7a1271b	test_s3: mark test_oject_head_zero_bytes fails_on_rgw It works on civetweb, fails on apache. Revert this once it is fixed. See http://tracker.ceph.com/issues/15460 Signed-off-by: Sage Weil <sage@redhat.com>	2016-04-12 08:29:02 -04:00