Merge "Bump supported Swift version up to Kilo"

2015-06-05 01:56:47 +00:00
parent 69f943934b 252b5dda4e
commit 995459e230
4 changed files with 4 additions and 1 deletions
--- a/swift3/test/functional/conf/account-server.conf.in
+++ b/swift3/test/functional/conf/account-server.conf.in
@@ -1,5 +1,6 @@
 [DEFAULT]
 user = %USER%
+bind_port = 6002
 swift_dir = %TEST_DIR%/etc
 devices = %TEST_DIR%
 mount_check = false
--- a/swift3/test/functional/conf/container-server.conf.in
+++ b/swift3/test/functional/conf/container-server.conf.in
@@ -1,5 +1,6 @@
 [DEFAULT]
 user = %USER%
+bind_port = 6001
 swift_dir = %TEST_DIR%/etc
 devices = %TEST_DIR%
 mount_check = false
--- a/swift3/test/functional/conf/object-server.conf.in
+++ b/swift3/test/functional/conf/object-server.conf.in
@@ -1,5 +1,6 @@
 [DEFAULT]
 user = %USER%
+bind_port = 6000
 swift_dir = %TEST_DIR%/etc
 devices = %TEST_DIR%
 mount_check = false
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@ usedevelop = True
 install_command = pip install {opts} {packages}
 deps =
  -r{toxinidir}/test-requirements.txt
-  https://launchpad.net/swift/juno/2.1.0/+download/swift-2.1.0.tar.gz
+  https://launchpad.net/swift/kilo/2.3.0/+download/swift-2.3.0.tar.gz
 commands = nosetests {posargs:swift3/test/unit}
 setenv = VIRTUAL_ENV={envdir}
         NOSE_WITH_OPENSTACK=1