author | Danek Duvall <danek.duvall@oracle.com> |
Tue, 07 Apr 2015 13:31:20 -0700 | |
branch | s11-update |
changeset 4072 | db0cec748ec0 |
parent 3482 | 79084a3d7cd3 |
child 5448 | 56f4540f741d |
permissions | -rw-r--r-- |
3135
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
1 |
Various testing fixes: |
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
2 |
|
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
3 |
- Tests involving large (5GB+) bodies are mocked, but on 32-bit python, |
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
4 |
len() is limited to returning a ssize_t, which can represent 2GB. |
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
5 |
|
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
6 |
- Solaris doesn't yet support syslog logging to /dev/log. |
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
7 |
|
3482
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
8 |
- Solaris exclusive file locks don't fail when applied multiple times |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
9 |
from a single process (it has to happen in a separate process). |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
10 |
|
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
11 |
- Uncomment portions of test/sample.conf to match what we ship in |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
12 |
/etc/swift/swift.conf, since the latter can't be read without |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
13 |
sufficient privileges. This allows us to set SWIFT_TEST_CONFIG_FILE |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
14 |
and run the functional tests. |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
15 |
|
3178
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3135
diff
changeset
|
16 |
The first, while potentially useful elsewhere, is really only an issue on |
77584387a894
PSARC/2014/207 OpenStack Glance Update to Havana
Drew Fisher <drew.fisher@oracle.com>
parents:
3135
diff
changeset
|
17 |
Solaris because Linux runs almost exclusively 64-bit, which makes this a |
3482
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
18 |
non-issue. The second is Solaris-only -- though clearly a similar problem |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
19 |
exists on MacOS -- and we will want to fix this in our Python. The third |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
20 |
is not in a form that is worth sending upstream. To test this properly, |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
21 |
the test should fork a separate process to test the lock, which should work |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
22 |
regardless of the OS. |
3135
0a68f5e884e0
PSARC 2014/050 OpenStack Swift (OpenStack Object Storage Service)
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
23 |
|
4072
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
24 |
--- swift-2.2.2/test/sample.conf.~1~ 2015-02-01 23:44:11.000000000 -0800 |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
25 |
+++ swift-2.2.2/test/sample.conf 2015-02-26 16:36:42.753470819 -0800 |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
26 |
@@ -62,17 +62,17 @@ fake_syslog = False |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
27 |
# Note that the cluster must have "sane" values for the test suite to pass |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
28 |
# (for some definition of sane). |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
29 |
# |
3482
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
30 |
-#max_file_size = 5368709122 |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
31 |
-#max_meta_name_length = 128 |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
32 |
-#max_meta_value_length = 256 |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
33 |
-#max_meta_count = 90 |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
34 |
-#max_meta_overall_size = 4096 |
4072
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
35 |
-#max_header_size = 8192 |
3482
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
36 |
-#max_object_name_length = 1024 |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
37 |
-#container_listing_limit = 10000 |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
38 |
-#account_listing_limit = 10000 |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
39 |
-#max_account_name_length = 256 |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
40 |
-#max_container_name_length = 256 |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
41 |
+max_file_size = 5368709122 |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
42 |
+max_meta_name_length = 128 |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
43 |
+max_meta_value_length = 256 |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
44 |
+max_meta_count = 90 |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
45 |
+max_meta_overall_size = 4096 |
4072
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
46 |
+max_header_size = 8192 |
3482
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
47 |
+max_object_name_length = 1024 |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
48 |
+container_listing_limit = 10000 |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
49 |
+account_listing_limit = 10000 |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
50 |
+max_account_name_length = 256 |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
51 |
+max_container_name_length = 256 |
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
52 |
|
4072
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
53 |
# Newer swift versions default to strict cors mode, but older ones were the |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
54 |
# opposite. |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
55 |
--- swift-2.2.2/test/unit/__init__.py.~1~ 2015-02-26 16:36:42.754399372 -0800 |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
56 |
+++ swift-2.2.2/test/unit/__init__.py 2015-02-26 16:41:30.006380635 -0800 |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
57 |
@@ -670,7 +670,7 @@ def fake_http_connect(*code_iter, **kwar |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
58 |
etag = '"68b329da9893e34099c7d8ad5cb9c940"' |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
59 |
|
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
60 |
headers = swob.HeaderKeyDict({ |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
61 |
- 'content-length': len(self.body), |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
62 |
+ 'content-length': self.body.__len__(), |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
63 |
'content-type': 'x-application/test', |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
64 |
'x-timestamp': self.timestamp, |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
65 |
'x-backend-timestamp': self.timestamp, |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
66 |
--- swift-2.2.2/test/unit/common/test_utils.py.~1~ 2015-02-01 23:44:11.000000000 -0800 |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
67 |
+++ swift-2.2.2/test/unit/common/test_utils.py 2015-02-26 16:36:42.756657286 -0800 |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
68 |
@@ -52,6 +52,7 @@ from functools import partial |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
69 |
from tempfile import TemporaryFile, NamedTemporaryFile, mkdtemp |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
70 |
from netifaces import AF_INET6 |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
71 |
from mock import MagicMock, patch |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
72 |
+from nose import SkipTest |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
73 |
|
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
74 |
from swift.common.exceptions import (Timeout, MessageTimeout, |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
75 |
ConnectionTimeout, LockTimeout, |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
76 |
@@ -733,6 +734,8 @@ class TestUtils(unittest.TestCase): |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
77 |
utils.HASH_PATH_PREFIX = 'startcap' |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
78 |
|
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
79 |
def test_lock_path(self): |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
80 |
+ if sys.platform == 'sunos5': |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
81 |
+ raise SkipTest |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
82 |
tmpdir = mkdtemp() |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
83 |
try: |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
84 |
with utils.lock_path(tmpdir, 0.1): |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
85 |
@@ -749,6 +752,8 @@ class TestUtils(unittest.TestCase): |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
86 |
shutil.rmtree(tmpdir) |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
87 |
|
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
88 |
def test_lock_path_num_sleeps(self): |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
89 |
+ if sys.platform == 'sunos5': |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
90 |
+ raise SkipTest |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
91 |
tmpdir = mkdtemp() |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
92 |
num_short_calls = [0] |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
93 |
exception_raised = [False] |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
94 |
@@ -773,6 +778,8 @@ class TestUtils(unittest.TestCase): |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
95 |
self.assertTrue(exception_raised[0]) |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
96 |
|
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
97 |
def test_lock_path_class(self): |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
98 |
+ if sys.platform == 'sunos5': |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
99 |
+ raise SkipTest |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
100 |
tmpdir = mkdtemp() |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
101 |
try: |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
102 |
with utils.lock_path(tmpdir, 0.1, ReplicationLockTimeout): |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
103 |
@@ -1195,7 +1202,8 @@ class TestUtils(unittest.TestCase): |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
104 |
}, 'server', log_route='server') |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
105 |
expected_args = [((), {'address': '/dev/log', |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
106 |
'facility': orig_sysloghandler.LOG_LOCAL3})] |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
107 |
- if not os.path.exists('/dev/log') or \ |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
108 |
+ if sys.platform == 'sunos5' or \ |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
109 |
+ not os.path.exists('/dev/log') or \ |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
110 |
os.path.isfile('/dev/log') or \ |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
111 |
os.path.isdir('/dev/log'): |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
112 |
# Since socket on OSX is in /var/run/syslog, there will be |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
113 |
@@ -2374,6 +2382,8 @@ cluster_dfw1 = http://dfw1.host/v1/ |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
114 |
MagicMock(side_effect=BaseException('test3'))) |
3482
79084a3d7cd3
19878891 problem in SERVICE/SWIFT
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
115 |
|
4072
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
116 |
def test_lock_file(self): |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
117 |
+ if sys.platform == 'sunos5': |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
118 |
+ raise SkipTest |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
119 |
flags = os.O_CREAT | os.O_RDWR |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
120 |
with NamedTemporaryFile(delete=False) as nt: |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
121 |
nt.write("test string") |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
122 |
@@ -2452,6 +2462,8 @@ cluster_dfw1 = http://dfw1.host/v1/ |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
123 |
os.fstat(f.fileno()).st_ino) |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
124 |
|
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
125 |
def test_lock_file_held_on_unlink(self): |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
126 |
+ if sys.platform == 'sunos5': |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
127 |
+ raise SkipTest |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
128 |
os_unlink = os.unlink |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
129 |
|
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
130 |
def flocking_unlink(filename): |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
131 |
@@ -2468,6 +2480,8 @@ cluster_dfw1 = http://dfw1.host/v1/ |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
132 |
pass |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
133 |
|
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
134 |
def test_lock_file_no_unlink_if_fail(self): |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
135 |
+ if sys.platform == 'sunos5': |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
136 |
+ raise SkipTest |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
137 |
os_open = os.open |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
138 |
with NamedTemporaryFile(delete=True) as nt: |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
139 |
|
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
140 |
--- swift-2.2.2/test/unit/obj/test_diskfile.py.~1~ 2015-02-01 23:44:11.000000000 -0800 |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
141 |
+++ swift-2.2.2/test/unit/obj/test_diskfile.py 2015-02-26 16:36:42.757582696 -0800 |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
142 |
@@ -18,6 +18,7 @@ |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
143 |
|
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
144 |
import cPickle as pickle |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
145 |
import os |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
146 |
+import sys |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
147 |
import errno |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
148 |
import mock |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
149 |
import unittest |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
150 |
@@ -902,6 +903,8 @@ class TestDiskFileManager(unittest.TestC |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
151 |
self.assertEqual(hashes, {}) |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
152 |
|
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
153 |
def test_replication_lock_on(self): |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
154 |
+ if sys.platform == 'sunos5': |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
155 |
+ raise SkipTest |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
156 |
# Double check settings |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
157 |
self.df_mgr.replication_one_per_device = True |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
158 |
self.df_mgr.replication_lock_timeout = 0.1 |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
159 |
--- swift-2.2.2/test/unit/proxy/test_server.py.~1~ 2015-02-01 23:44:11.000000000 -0800 |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
160 |
+++ swift-2.2.2/test/unit/proxy/test_server.py 2015-02-26 16:36:42.760354922 -0800 |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
161 |
@@ -3376,6 +3376,9 @@ class TestObjectController(unittest.Test |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
162 |
|
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
163 |
class LargeResponseBody(object): |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
164 |
|
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
165 |
+ def __nonzero__(self): |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
166 |
+ return True |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
167 |
+ |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
168 |
def __len__(self): |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
169 |
return constraints.MAX_FILE_SIZE + 1 |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
170 |
|
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
171 |
@@ -3620,6 +3623,9 @@ class TestObjectController(unittest.Test |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
172 |
|
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
173 |
class LargeResponseBody(object): |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
174 |
|
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
175 |
+ def __nonzero__(self): |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
176 |
+ return True |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
177 |
+ |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
178 |
def __len__(self): |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
179 |
return constraints.MAX_FILE_SIZE + 1 |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
180 |
|
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
181 |
@@ -3644,6 +3650,9 @@ class TestObjectController(unittest.Test |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
182 |
|
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
183 |
class LargeResponseBody(object): |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
184 |
|
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
185 |
+ def __nonzero__(self): |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
186 |
+ return True |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
187 |
+ |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
188 |
def __len__(self): |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
189 |
return constraints.MAX_FILE_SIZE + 1 |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3482
diff
changeset
|
190 |