Merge lp:~gandelman-a/ubuntu/saucy/python-troveclient/1226871 into lp:~ubuntu-server-dev/python-troveclient/havana

Proposed by Adam Gandelman
Status: Merged
Approved by: Chuck Short
Approved revision: 4
Merged at revision: 3
Proposed branch: lp:~gandelman-a/ubuntu/saucy/python-troveclient/1226871
Merge into: lp:~ubuntu-server-dev/python-troveclient/havana
Diff against target: 48 lines (+26/-0)
3 files modified
debian/changelog (+8/-0)
debian/tests/client (+16/-0)
debian/tests/control (+2/-0)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/saucy/python-troveclient/1226871
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+187113@code.launchpad.net

Description of the change

  * debian/*: Remove +x from files that do not require it.
  * debian/tests/{client, control}: Checkin simple dep8 test to
    ensure functioning client using '-h'. (LP: #1226871)

To post a comment you must log in.
Revision history for this message
Chuck Short (zulcss) wrote :

I do believe debian/tests is missing in this commit.

4. By Adam Gandelman

Checkin missing dep8 directory.

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-09-06 20:39:01 +0000
3+++ debian/changelog 2013-09-24 19:02:27 +0000
4@@ -1,3 +1,11 @@
5+python-troveclient (1:0.1.4-0ubuntu2) UNRELEASED; urgency=low
6+
7+ * debian/*: Remove +x from files that do not require it.
8+ * debian/tests/{client, control}: Checkin simple dep8 test to
9+ ensure functioning client using '-h'. (LP: #1226871)
10+
11+ -- Adam Gandelman <adamg@ubuntu.com> Mon, 23 Sep 2013 15:04:02 -0700
12+
13 python-troveclient (1:0.1.4-0ubuntu1) saucy; urgency=low
14
15 * Initial release.
16
17=== modified file 'debian/compat' (properties changed: +x to -x)
18=== modified file 'debian/pydist-overrides' (properties changed: +x to -x)
19=== added directory 'debian/tests'
20=== added file 'debian/tests/client'
21--- debian/tests/client 1970-01-01 00:00:00 +0000
22+++ debian/tests/client 2013-09-24 19:02:27 +0000
23@@ -0,0 +1,16 @@
24+#!/bin/bash
25+#-------------------------
26+# Testing client utilities
27+#-------------------------
28+set -e
29+
30+HELP_CLIENTS=('trove-cli')
31+for client in "${HELP_CLIENTS[@]}"; do
32+ if ! $client -h 2>&1 > /dev/null; then
33+ echo "ERROR, ${client} did not run"
34+ exit 1
35+ else
36+ echo "OK: ${client} ran"
37+ fi
38+done
39+exit 0
40
41=== added file 'debian/tests/control'
42--- debian/tests/control 1970-01-01 00:00:00 +0000
43+++ debian/tests/control 2013-09-24 19:02:27 +0000
44@@ -0,0 +1,2 @@
45+Tests: client
46+Depends: python-troveclient
47
48=== modified file 'debian/watch' (properties changed: +x to -x)

Subscribers

People subscribed via source and target branches