clayg

diff --git a/test/unit/container/test_backend.py b/test/unit/container/test_backend.py
index 78cfb8e..02bb4da 100644
--- a/test/unit/container/test_backend.py
+++ b/test/unit/container/test_backend.py
@@ -1082,7 +1082,12 @@ class TestContainerBroker(unittest.TestCase):
         broker = ContainerBroker(':memory:', account='test_account',
                                  container='test_container')
         broker.initialize(normalize_timestamp('1'), 0)
+        info = broker.get_info()
+        self.assertEqual(0, info['storage_policy_index'])

clayg

#!/usr/bin/python -u
# Copyright (c) 2010-2012 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#    http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software

clayg

vagrant@saio:~$ curl -s -H 'x-auth-token: AUTH_tka9a6cfc5c7fb4a659070095f460906c3' http://saio:8080/v1/AUTH_test -I -XHEAD | grep -i meta
X-Account-Meta-Foo: bar

# send x-remove-account-meta-foo and also x-account-meta-test

vagrant@saio:~$ curl -H 'x-auth-token: AUTH_tka9a6cfc5c7fb4a659070095f460906c3' http://saio:8080/v1/AUTH_test -I -XPOST -H 'x-remove-account-meta-foo: bar' -H 'x-account-meta-test: value'
HTTP/1.1 204 No Content
Content-Length: 0
Content-Type: text/html; charset=UTF-8
X-Trans-Id: tx385fddb242044c6392129-0053324e74

clayg

#!/bin/bash
JOB=1
TD=0
if [ $JOB -eq 1 ] ; then
    echo "test failed"
    exit 1
fi
if [ $TD -eq 1 ] ; then
    echo "teardown failed"
    exit 1

clayg

diff --git a/test/functional/__init__.py b/test/functional/__init__.py
index 04e0b3a..63b1c8c 100644
--- a/test/functional/__init__.py
+++ b/test/functional/__init__.py
@@ -97,6 +97,12 @@ class FakeMemcacheMiddleware(object):
         return self.app(env, start_response)
 
 
+def fake_memcache_filter_factory(conf):
+    def filter_app(app):

clayg

creating build/temp.linux-x86_64-2.6/build
creating build/temp.linux-x86_64-2.6/build/temp.linux-x86_64-2.6
gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I/usr/include/python2.6 -c build/temp.linux-x86_64-2.6/conftest-0.c -o build/temp.linux-x86_64-2.6/build/temp.linux-x86_64-2.6/conftest-0.o
gcc -pthread build/temp.linux-x86_64-2.6/build/temp.linux-x86_64-2.6/conftest-0.o -o build/temp.linux-x86_64-2.6/conftest

clayg

diff --git a/swift/account/backend.py b/swift/account/backend.py
index 8adc3b8..030f08c 100644
--- a/swift/account/backend.py
+++ b/swift/account/backend.py
@@ -420,9 +420,9 @@ class AccountBroker(DatabaseBroker):
             conn.commit()
 
 
-class AccountBackend(AccountBroker):
+class AccountBackend(object):

clayg

diff --git a/swift/common/middleware/keystoneauth.py b/swift/common/middleware/keystoneauth.py
index 096af45..16c9efd 100644
--- a/swift/common/middleware/keystoneauth.py
+++ b/swift/common/middleware/keystoneauth.py
@@ -88,7 +88,7 @@ class KeystoneAuth(object):
         self.allow_overrides = swift_utils.config_true_value(config_overrides)
 
     def __call__(self, environ, start_response):
-        identity = self._keystone_identity(environ)
+        identity = self._integral_keystone_identity(environ)

clayg

import sys
import time
import random

from eventlet import Timeout, GreenPool, queue, debug
from swift.common.bufferedhttp import http_connect
from swift.common.http import is_success
from swift.common.ring import Ring

debug.hub_exceptions(True)

clayg

#! /bin/bash
python swift/test/probe/test_container_merge_policy_index.py split-brain -c test stop_first_half put_container:0 start_first_half
sleep 3
rm -fr /srv/node[1]/*/containers/*
sleep 3
python swift/test/probe/test_container_merge_policy_index.py split-brain -c test stop_second_half put_container:1 start_second_half
sleep 3
rm -fr /srv/node[3]/*/containers/*
sleep 3