test.patch revision 3482
2810N/AVarious testing fixes:
2810N/A
2810N/A - Tests involving large (5GB+) bodies are mocked, but on 32-bit python,
2810N/A len() is limited to returning a ssize_t, which can represent 2GB.
2810N/A
2810N/A - Solaris doesn't yet support syslog logging to /dev/log.
2810N/A
3482N/A - Solaris exclusive file locks don't fail when applied multiple times
3482N/A from a single process (it has to happen in a separate process).
3482N/A
3482N/A - Uncomment portions of test/sample.conf to match what we ship in
3482N/A /etc/swift/swift.conf, since the latter can't be read without
3482N/A sufficient privileges. This allows us to set SWIFT_TEST_CONFIG_FILE
3482N/A and run the functional tests.
3482N/A
2900N/AThe first, while potentially useful elsewhere, is really only an issue on
2900N/ASolaris because Linux runs almost exclusively 64-bit, which makes this a
3482N/Anon-issue. The second is Solaris-only -- though clearly a similar problem
3482N/Aexists on MacOS -- and we will want to fix this in our Python. The third
3482N/Ais not in a form that is worth sending upstream. To test this properly,
3482N/Athe test should fork a separate process to test the lock, which should work
3482N/Aregardless of the OS.
2810N/A
2810N/Adiff --git a/test/unit/__init__.py b/test/unit/__init__.py
2810N/A--- a/test/unit/__init__.py
2810N/A+++ b/test/unit/__init__.py
2900N/A@@ -450,7 +450,7 @@ def fake_http_connect(*code_iter, **kwar
2810N/A else:
2810N/A etag = '"68b329da9893e34099c7d8ad5cb9c940"'
2810N/A
2810N/A- headers = {'content-length': len(self.body),
2810N/A+ headers = {'content-length': self.body.__len__(),
2810N/A 'content-type': 'x-application/test',
2810N/A 'x-timestamp': self.timestamp,
2810N/A 'last-modified': self.timestamp,
2810N/Adiff --git a/test/unit/proxy/test_server.py b/test/unit/proxy/test_server.py
2810N/A--- a/test/unit/proxy/test_server.py
2810N/A+++ b/test/unit/proxy/test_server.py
2900N/A@@ -2876,6 +2876,9 @@ class TestObjectController(unittest.Test
2810N/A
2810N/A class LargeResponseBody(object):
2810N/A
2810N/A+ def __nonzero__(self):
2810N/A+ return True
2810N/A+
2810N/A def __len__(self):
2810N/A return MAX_FILE_SIZE + 1
2810N/A
2900N/A@@ -3006,6 +3009,9 @@ class TestObjectController(unittest.Test
2810N/A
2810N/A class LargeResponseBody(object):
2810N/A
2810N/A+ def __nonzero__(self):
2810N/A+ return True
2810N/A+
2810N/A def __len__(self):
2810N/A return MAX_FILE_SIZE + 1
2810N/A
2810N/Adiff --git a/test/unit/common/test_utils.py b/test/unit/common/test_utils.py
2810N/A--- a/test/unit/common/test_utils.py
2810N/A+++ b/test/unit/common/test_utils.py
2900N/A@@ -437,7 +437,8 @@ class TestUtils(unittest.TestCase):
2810N/A }, 'server', log_route='server')
2900N/A expected_args = [((), {'address': '/dev/log',
2900N/A 'facility': orig_sysloghandler.LOG_LOCAL3})]
2900N/A- if not os.path.exists('/dev/log') or \
2900N/A+ if sys.platform == 'sunos5' or \
2900N/A+ not os.path.exists('/dev/log') or \
2900N/A os.path.isfile('/dev/log') or \
2900N/A os.path.isdir('/dev/log'):
2900N/A # Since socket on OSX is in /var/run/syslog, there will be
3482N/Adiff --git a/test/unit/common/test_utils.py b/test/unit/common/test_utils.py
3482N/A--- a/test/unit/common/test_utils.py
3482N/A+++ b/test/unit/common/test_utils.py
3482N/A@@ -46,6 +46,7 @@
3482N/A from tempfile import TemporaryFile, NamedTemporaryFile, mkdtemp
3482N/A from netifaces import AF_INET6
3482N/A from mock import MagicMock, patch
3482N/A+from nose import SkipTest
3482N/A
3482N/A from swift.common.exceptions import (Timeout, MessageTimeout,
3482N/A ConnectionTimeout, LockTimeout)
3482N/A@@ -1406,6 +1407,8 @@
3482N/A MagicMock(side_effect=BaseException('test3')))
3482N/A
3482N/A def test_lock_file(self):
3482N/A+ if sys.platform == 'sunos5':
3482N/A+ raise SkipTest
3482N/A flags = os.O_CREAT | os.O_RDWR
3482N/A with NamedTemporaryFile(delete=False) as nt:
3482N/A nt.write("test string")
3482N/Adiff --git a/test/sample.conf b/test/unit/sample.conf
3482N/A--- a/test/sample.conf
3482N/A+++ b/test/sample.conf
3482N/A@@ -29,16 +29,16 @@ password3 = testing3
3482N/A # to set them from /etc/swift/swift.conf. If that file isn't found,
3482N/A # the test runner will skip tests that depend on these values.
3482N/A # Note that the cluster must have "sane" values for the test suite to pass.
3482N/A-#max_file_size = 5368709122
3482N/A-#max_meta_name_length = 128
3482N/A-#max_meta_value_length = 256
3482N/A-#max_meta_count = 90
3482N/A-#max_meta_overall_size = 4096
3482N/A-#max_object_name_length = 1024
3482N/A-#container_listing_limit = 10000
3482N/A-#account_listing_limit = 10000
3482N/A-#max_account_name_length = 256
3482N/A-#max_container_name_length = 256
3482N/A+max_file_size = 5368709122
3482N/A+max_meta_name_length = 128
3482N/A+max_meta_value_length = 256
3482N/A+max_meta_count = 90
3482N/A+max_meta_overall_size = 4096
3482N/A+max_object_name_length = 1024
3482N/A+container_listing_limit = 10000
3482N/A+account_listing_limit = 10000
3482N/A+max_account_name_length = 256
3482N/A+max_container_name_length = 256
3482N/A
3482N/A collate = C
3482N/A