Merge lp:~quickly-committers/quickly/fixtests into lp:quickly

Proposed by Tony Byrne
Status: Needs review
Proposed branch: lp:~quickly-committers/quickly/fixtests
Merge into: lp:quickly
Diff against target: 59 lines (+2/-11)
3 files modified
quickly/test/completion.sh (+0/-9)
quickly/test/quickly.sh (+1/-1)
quickly/test/version.sh (+1/-1)
To merge this branch: bzr merge lp:~quickly-committers/quickly/fixtests
Reviewer Review Type Date Requested Status
Quickly Developers Pending
Review via email: mp+81381@code.launchpad.net

Description of the change

A couple of trivial changes to quickly.sh and version.sh. Removed references to ppa in completion.sh, they simply do not work for me, the script hangs forever. Michael Terry looked at this for me last year but still no joy. Tests really need to be broken into smaller sections with timeouts but I don't have any shell scripting skills.

To post a comment you must log in.

Unmerged revisions

639. By Tony Byrne <email address hidden> <email address hidden>

tests now run successfully
there may be too many changes to quickly/test/version.sh

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'quickly/test/completion.sh'
--- quickly/test/completion.sh 2011-03-03 17:37:43 +0000
+++ quickly/test/completion.sh 2011-11-05 23:40:28 +0000
@@ -158,9 +158,6 @@
158158
159## For this one, we provide an actual string to finish completing, to help make the results consistent between users159## For this one, we provide an actual string to finish completing, to help make the results consistent between users
160160
161quickly shell-completion quickly configure ppa quickly/
162# quickly/daily-build quickly/ppa
163
164quickly shell-completion quickly configure target-distribution foo161quickly shell-completion quickly configure target-distribution foo
165# 162#
166163
@@ -212,9 +209,6 @@
212quickly shell-completion quickly release -209quickly shell-completion quickly release -
213# --help --ppa --staging --template --verbose --version -h -t210# --help --ppa --staging --template --verbose --version -h -t
214211
215quickly shell-completion quickly release --ppa quickly/
216# quickly/daily-build quickly/ppa
217
218quickly shell-completion quickly release foo212quickly shell-completion quickly release foo
219# 213#
220214
@@ -227,9 +221,6 @@
227quickly shell-completion quickly share -221quickly shell-completion quickly share -
228# --help --ppa --staging --template --verbose --version -h -t222# --help --ppa --staging --template --verbose --version -h -t
229223
230quickly shell-completion quickly share --ppa quickly/
231# quickly/daily-build quickly/ppa
232
233quickly shell-completion quickly share foo224quickly shell-completion quickly share foo
234# 225#
235226
236227
=== modified file 'quickly/test/quickly.sh'
--- quickly/test/quickly.sh 2011-03-02 22:59:32 +0000
+++ quickly/test/quickly.sh 2011-11-05 23:40:28 +0000
@@ -7,7 +7,7 @@
7# Usage: quickly quickly [origin-template] destination-template7# Usage: quickly quickly [origin-template] destination-template
88
9export HOME=/tmp/quickly-test; quickly quickly ubuntu-application test-template9export HOME=/tmp/quickly-test; quickly quickly ubuntu-application test-template
10# Copy ubuntu-application to create new /tmp/quickly-test/quickly-templates/test-template template10# Creating /tmp/quickly-test/quickly-templates/test-template template from ubuntu-application
1111
12export HOME=/tmp/quickly-test; quickly quickly ubuntu-application test-template12export HOME=/tmp/quickly-test; quickly quickly ubuntu-application test-template
13# /tmp/quickly-test/quickly-templates/test-template already exists.13# /tmp/quickly-test/quickly-templates/test-template already exists.
1414
=== modified file 'quickly/test/version.sh'
--- quickly/test/version.sh 2011-06-08 13:48:05 +0000
+++ quickly/test/version.sh 2011-11-05 23:40:28 +0000
@@ -13,7 +13,7 @@
13# 13#
14# Copyright 2009 Rick Spencer14# Copyright 2009 Rick Spencer
15# Copyright 2009-2011 Didier Roche15# Copyright 2009-2011 Didier Roche
16# Copyright 2010-2011 Michael Terry16# Copyright 2010-2011 Canonical Ltd
17# https://launchpad.net/quickly17# https://launchpad.net/quickly
18# 18#
19# quickly comes with ABSOLUTELY NO WARRANTY. quickly is free software, and19# quickly comes with ABSOLUTELY NO WARRANTY. quickly is free software, and

Subscribers

People subscribed via source and target branches