OpenStack Object Storage (swift)

Merge lp:~james-page/swift/daemon-test-fix into lp:~ubuntu-server-dev/swift/icehouse

  1. daemon-test-fix
  2. Merge into icehouse
Proposed by James Page
Status: Merged
Merged at revision: 160
Proposed branch: lp:~james-page/swift/daemon-test-fix
Merge into: lp:~ubuntu-server-dev/swift/icehouse
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/tests/swift-daemons (+1/-1)
To merge this branch: bzr merge lp:~james-page/swift/daemon-test-fix
Reviewer Review Type Date Requested Status
Robie Basak Approve
Review via email: mp+198892@code.launchpad.net

Description of the change

Fixup failing tests

To post a comment you must log in.
Revision history for this message
Robie Basak (racb) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-12-12 20:18:51 +0000
3+++ debian/changelog 2013-12-13 09:21:31 +0000
4@@ -1,3 +1,10 @@
5+swift (1.11.0-0ubuntu2) trusty; urgency=low
6+
7+ * d/tests/swift-daemons: Use service command to restart daemons instead
8+ of directly using non-existent scripts in /etc/init.d.
9+
10+ -- James Page <james.page@ubuntu.com> Fri, 13 Dec 2013 09:14:19 +0000
11+
12 swift (1.11.0-0ubuntu1) trusty; urgency=low
13
14 [ Chuck Short ]
15
16=== modified file 'debian/tests/swift-daemons'
17--- debian/tests/swift-daemons 2013-06-12 11:35:46 +0000
18+++ debian/tests/swift-daemons 2013-12-13 09:21:31 +0000
19@@ -25,7 +25,7 @@
20
21 DAEMONS=('swift-proxy' 'swift-object' 'swift-container' 'swift-account')
22 for daemon in "${DAEMONS[@]}"; do
23- /etc/init.d/$daemon restart 2>&1 > /dev/null
24+ service $daemon restart 2>&1 > /dev/null
25 if pidof -x ${daemon}-server > /dev/null; then
26 echo "OK"
27 else

Subscribers

People subscribed via source and target branches