Merge pull request #144 from mdw-at-linuxbox/ceph-kraken-setupfix

Use non-broken version of setuptools, and fix bootstrap to be more po…

bootstrap

@@ -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
+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
-if [ -f /etc/redhat-release ]; then
+    done
-    for package in python-pip python-virtualenv python-devel libevent-devel; do
+    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
+# slightly old version of setuptools; newer fails w/ requests 0.14.0
-./virtualenv/bin/pip install setuptools --no-use-wheel --upgrade
+./virtualenv/bin/pip install setuptools==32.3.1
 
 ./virtualenv/bin/pip install -r requirements.txt
 

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')