From 29eddb8c24c1faf06e73c3ff6ba8d438645f66a2 Mon Sep 17 00:00:00 2001
From: Clay Gerrard <clay.gerrard@rackspace.com>
Date: Wed, 19 Jan 2011 16:05:22 -0600
Subject: [PATCH] made tests play nice with standalone unittest, fixed some doc
 stuff

---
 doc/source/development_saio.rst | 6 +++---
 test/unit/obj/test_auditor.py   | 1 +
 test/unit/obj/test_server.py    | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/source/development_saio.rst b/doc/source/development_saio.rst
index 1967215d4b..bd0753794e 100644
--- a/doc/source/development_saio.rst
+++ b/doc/source/development_saio.rst
@@ -50,7 +50,7 @@ If you are going to use a separate partition for Swift data, be sure to add anot
        `/dev/sdb1 /mnt/sdb1 xfs noatime,nodiratime,nobarrier,logbufs=8 0 0`
   #. `mkdir /mnt/sdb1`
   #. `mount /mnt/sdb1`
-  #. `mkdir /mnt/sdb1/1 /mnt/sdb1/2 /mnt/sdb1/3 /mnt/sdb1/4 /mnt/sdb1/test`
+  #. `mkdir /mnt/sdb1/1 /mnt/sdb1/2 /mnt/sdb1/3 /mnt/sdb1/4`
   #. `chown <your-user-name>:<your-group-name> /mnt/sdb1/*`
   #. `mkdir /srv`
   #. `for x in {1..4}; do ln -s /mnt/sdb1/$x /srv/$x; done`
@@ -77,7 +77,7 @@ If you want to use a loopback device instead of another partition, follow these
        `/srv/swift-disk /mnt/sdb1 xfs loop,noatime,nodiratime,nobarrier,logbufs=8 0 0`
   #. `mkdir /mnt/sdb1`
   #. `mount /mnt/sdb1`
-  #. `mkdir /mnt/sdb1/1 /mnt/sdb1/2 /mnt/sdb1/3 /mnt/sdb1/4 /mnt/sdb1/test`
+  #. `mkdir /mnt/sdb1/1 /mnt/sdb1/2 /mnt/sdb1/3 /mnt/sdb1/4`
   #. `chown <your-user-name>:<your-group-name> /mnt/sdb1/*`
   #. `mkdir /srv`
   #. `for x in {1..4}; do ln -s /mnt/sdb1/$x /srv/$x; done`
@@ -535,7 +535,7 @@ Setting up scripts for running Swift
         sudo umount /mnt/sdb1
         sudo mkfs.xfs -f -i size=1024 /dev/sdb1
         sudo mount /mnt/sdb1
-        sudo mkdir /mnt/sdb1/1 /mnt/sdb1/2 /mnt/sdb1/3 /mnt/sdb1/4 /mnt/sdb1/test
+        sudo mkdir /mnt/sdb1/1 /mnt/sdb1/2 /mnt/sdb1/3 /mnt/sdb1/4
         sudo chown <your-user-name>:<your-group-name> /mnt/sdb1/*
         mkdir -p /srv/1/node/sdb1 /srv/2/node/sdb2 /srv/3/node/sdb3 /srv/4/node/sdb4
         sudo rm -f /var/log/debug /var/log/messages /var/log/rsyncd.log /var/log/syslog
diff --git a/test/unit/obj/test_auditor.py b/test/unit/obj/test_auditor.py
index 41d4453ce8..8c1d08e522 100644
--- a/test/unit/obj/test_auditor.py
+++ b/test/unit/obj/test_auditor.py
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 # TODO: Tests
+from test import unit as _setup_mocks
 import unittest
 import tempfile
 import os
diff --git a/test/unit/obj/test_server.py b/test/unit/obj/test_server.py
index e9c186b6b3..735b944d2d 100644
--- a/test/unit/obj/test_server.py
+++ b/test/unit/obj/test_server.py
@@ -27,7 +27,8 @@ from tempfile import mkdtemp
 
 from eventlet import sleep, spawn, wsgi, listen
 from webob import Request
-from xattr import getxattr, setxattr
+from test.unit import _getxattr as getxattr
+from test.unit import _setxattr as setxattr
 
 from test.unit import connect_tcp, readuntil2crlfs
 from swift.obj import server as object_server