OpenStack Object Storage (swift)

Merge lp:~gholt/swift/i18n_pass1 into lp:~redbo/swift/i18n_pass1

  1. i18n_pass1
  2. Merge into i18n_pass1
Proposed by gholt
Status: Merged
Approved by: Mike Barton
Approved revision: 150
Merged at revision: 150
Proposed branch: lp:~gholt/swift/i18n_pass1
Merge into: lp:~redbo/swift/i18n_pass1
Diff against target: 65 lines (+5/-5)
5 files modified
test/probe/test_account_failures.py (+1/-1)
test/probe/test_container_failures.py (+1/-1)
test/probe/test_object_async_update.py (+1/-1)
test/probe/test_object_handoff.py (+1/-1)
test/probe/test_running_with_each_type_down.py (+1/-1)
To merge this branch: bzr merge lp:~gholt/swift/i18n_pass1
Reviewer Review Type Date Requested Status
Mike Barton Pending
Review via email: mp+44514@code.launchpad.net

Description of the change

Fixed probe tests to not use relativity (on imports)

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'test/probe/__init__.py'
2=== modified file 'test/probe/test_account_failures.py'
3--- test/probe/test_account_failures.py 2010-09-04 04:39:44 +0000
4+++ test/probe/test_account_failures.py 2010-12-22 19:37:30 +0000
5@@ -21,7 +21,7 @@
6 from time import sleep
7
8 from swift.common import client
9-from common import get_to_final_state, kill_pids, reset_environment
10+from test.probe.common import get_to_final_state, kill_pids, reset_environment
11
12
13 class TestAccountFailures(unittest.TestCase):
14
15=== modified file 'test/probe/test_container_failures.py'
16--- test/probe/test_container_failures.py 2010-09-04 04:39:44 +0000
17+++ test/probe/test_container_failures.py 2010-12-22 19:37:30 +0000
18@@ -23,7 +23,7 @@
19
20 from swift.common import client
21
22-from common import get_to_final_state, kill_pids, reset_environment
23+from test.probe.common import get_to_final_state, kill_pids, reset_environment
24
25
26 class TestContainerFailures(unittest.TestCase):
27
28=== modified file 'test/probe/test_object_async_update.py'
29--- test/probe/test_object_async_update.py 2010-09-06 04:06:16 +0000
30+++ test/probe/test_object_async_update.py 2010-12-22 19:37:30 +0000
31@@ -23,7 +23,7 @@
32
33 from swift.common import client, direct_client
34
35-from common import kill_pids, reset_environment
36+from test.probe.common import kill_pids, reset_environment
37
38
39 class TestObjectAsyncUpdate(unittest.TestCase):
40
41=== modified file 'test/probe/test_object_handoff.py'
42--- test/probe/test_object_handoff.py 2010-09-06 04:06:16 +0000
43+++ test/probe/test_object_handoff.py 2010-12-22 19:37:30 +0000
44@@ -23,7 +23,7 @@
45
46 from swift.common import client, direct_client
47
48-from common import kill_pids, reset_environment
49+from test.probe.common import kill_pids, reset_environment
50
51
52 class TestObjectHandoff(unittest.TestCase):
53
54=== modified file 'test/probe/test_running_with_each_type_down.py'
55--- test/probe/test_running_with_each_type_down.py 2010-09-04 04:39:44 +0000
56+++ test/probe/test_running_with_each_type_down.py 2010-12-22 19:37:30 +0000
57@@ -22,7 +22,7 @@
58
59 from swift.common import client
60
61-from common import get_to_final_state, kill_pids, reset_environment
62+from test.probe.common import get_to_final_state, kill_pids, reset_environment
63
64
65 class TestRunningWithEachTypeDown(unittest.TestCase):

Subscribers

People subscribed via source and target branches

to all changes: