author | Drew Fisher <drew.fisher@oracle.com> |
Wed, 11 Jun 2014 17:13:12 -0700 | |
changeset 1944 | 56ac2df1785b |
parent 1896 | f83e6dde6c3b |
child 2167 | c9ff638a3018 |
permissions | -rw-r--r-- |
1896
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
1 |
Various testing fixes: |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
2 |
|
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
3 |
- Tests involving large (5GB+) bodies are mocked, but on 32-bit python, |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
4 |
len() is limited to returning a ssize_t, which can represent 2GB. |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
5 |
|
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
6 |
- Solaris doesn't yet support syslog logging to /dev/log. |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
7 |
|
1944
56ac2df1785b
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
1896
diff
changeset
|
8 |
The first, while potentially useful elsewhere, is really only an issue on |
56ac2df1785b
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
1896
diff
changeset
|
9 |
Solaris because Linux runs almost exclusively 64-bit, which makes this a |
56ac2df1785b
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
1896
diff
changeset
|
10 |
non-issue. The last is Solaris-only -- though clearly a similar problem |
56ac2df1785b
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
1896
diff
changeset
|
11 |
exists on MacOS -- and we will want to fix this in our Python. |
1896
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
12 |
|
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
13 |
diff --git a/test/unit/__init__.py b/test/unit/__init__.py |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
14 |
--- a/test/unit/__init__.py |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
15 |
+++ b/test/unit/__init__.py |
1944
56ac2df1785b
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
1896
diff
changeset
|
16 |
@@ -450,7 +450,7 @@ def fake_http_connect(*code_iter, **kwar |
1896
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
17 |
else: |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
18 |
etag = '"68b329da9893e34099c7d8ad5cb9c940"' |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
19 |
|
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
20 |
- headers = {'content-length': len(self.body), |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
21 |
+ headers = {'content-length': self.body.__len__(), |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
22 |
'content-type': 'x-application/test', |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
23 |
'x-timestamp': self.timestamp, |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
24 |
'last-modified': self.timestamp, |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
25 |
diff --git a/test/unit/proxy/test_server.py b/test/unit/proxy/test_server.py |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
26 |
--- a/test/unit/proxy/test_server.py |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
27 |
+++ b/test/unit/proxy/test_server.py |
1944
56ac2df1785b
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
1896
diff
changeset
|
28 |
@@ -2876,6 +2876,9 @@ class TestObjectController(unittest.Test |
1896
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
29 |
|
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
30 |
class LargeResponseBody(object): |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
31 |
|
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
32 |
+ def __nonzero__(self): |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
33 |
+ return True |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
34 |
+ |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
35 |
def __len__(self): |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
36 |
return MAX_FILE_SIZE + 1 |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
37 |
|
1944
56ac2df1785b
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
1896
diff
changeset
|
38 |
@@ -3006,6 +3009,9 @@ class TestObjectController(unittest.Test |
1896
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
39 |
|
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
40 |
class LargeResponseBody(object): |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
41 |
|
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
42 |
+ def __nonzero__(self): |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
43 |
+ return True |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
44 |
+ |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
45 |
def __len__(self): |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
46 |
return MAX_FILE_SIZE + 1 |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
47 |
|
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
48 |
diff --git a/test/unit/common/test_utils.py b/test/unit/common/test_utils.py |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
49 |
--- a/test/unit/common/test_utils.py |
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
50 |
+++ b/test/unit/common/test_utils.py |
1944
56ac2df1785b
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
1896
diff
changeset
|
51 |
@@ -437,7 +437,8 @@ class TestUtils(unittest.TestCase): |
1896
f83e6dde6c3b
18551677 Request to integrate Swift into userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
52 |
}, 'server', log_route='server') |
1944
56ac2df1785b
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
1896
diff
changeset
|
53 |
expected_args = [((), {'address': '/dev/log', |
56ac2df1785b
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
1896
diff
changeset
|
54 |
'facility': orig_sysloghandler.LOG_LOCAL3})] |
56ac2df1785b
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
1896
diff
changeset
|
55 |
- if not os.path.exists('/dev/log') or \ |
56ac2df1785b
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
1896
diff
changeset
|
56 |
+ if sys.platform == 'sunos5' or \ |
56ac2df1785b
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
1896
diff
changeset
|
57 |
+ not os.path.exists('/dev/log') or \ |
56ac2df1785b
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
1896
diff
changeset
|
58 |
os.path.isfile('/dev/log') or \ |
56ac2df1785b
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
1896
diff
changeset
|
59 |
os.path.isdir('/dev/log'): |
56ac2df1785b
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
1896
diff
changeset
|
60 |
# Since socket on OSX is in /var/run/syslog, there will be |