made tests play nice with standalone unittest, fixed some doc stuff

This commit is contained in:
Clay Gerrard
2011-01-19 16:05:22 -06:00
parent 105315dfc4
commit 29eddb8c24
3 changed files with 6 additions and 4 deletions

View File

@@ -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` `/dev/sdb1 /mnt/sdb1 xfs noatime,nodiratime,nobarrier,logbufs=8 0 0`
#. `mkdir /mnt/sdb1` #. `mkdir /mnt/sdb1`
#. `mount /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/*` #. `chown <your-user-name>:<your-group-name> /mnt/sdb1/*`
#. `mkdir /srv` #. `mkdir /srv`
#. `for x in {1..4}; do ln -s /mnt/sdb1/$x /srv/$x; done` #. `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` `/srv/swift-disk /mnt/sdb1 xfs loop,noatime,nodiratime,nobarrier,logbufs=8 0 0`
#. `mkdir /mnt/sdb1` #. `mkdir /mnt/sdb1`
#. `mount /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/*` #. `chown <your-user-name>:<your-group-name> /mnt/sdb1/*`
#. `mkdir /srv` #. `mkdir /srv`
#. `for x in {1..4}; do ln -s /mnt/sdb1/$x /srv/$x; done` #. `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 umount /mnt/sdb1
sudo mkfs.xfs -f -i size=1024 /dev/sdb1 sudo mkfs.xfs -f -i size=1024 /dev/sdb1
sudo mount /mnt/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/* 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 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 sudo rm -f /var/log/debug /var/log/messages /var/log/rsyncd.log /var/log/syslog

View File

@@ -14,6 +14,7 @@
# limitations under the License. # limitations under the License.
# TODO: Tests # TODO: Tests
from test import unit as _setup_mocks
import unittest import unittest
import tempfile import tempfile
import os import os

View File

@@ -27,7 +27,8 @@ from tempfile import mkdtemp
from eventlet import sleep, spawn, wsgi, listen from eventlet import sleep, spawn, wsgi, listen
from webob import Request 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 test.unit import connect_tcp, readuntil2crlfs
from swift.obj import server as object_server from swift.obj import server as object_server