Quickly

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

  1. fixtests
  2. Merge into trunk
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
1=== modified file 'quickly/test/completion.sh'
2--- quickly/test/completion.sh 2011-03-03 17:37:43 +0000
3+++ quickly/test/completion.sh 2011-11-05 23:40:28 +0000
4@@ -158,9 +158,6 @@
5
6 ## For this one, we provide an actual string to finish completing, to help make the results consistent between users
7
8-quickly shell-completion quickly configure ppa quickly/
9-# quickly/daily-build quickly/ppa
10-
11 quickly shell-completion quickly configure target-distribution foo
12 #
13
14@@ -212,9 +209,6 @@
15 quickly shell-completion quickly release -
16 # --help --ppa --staging --template --verbose --version -h -t
17
18-quickly shell-completion quickly release --ppa quickly/
19-# quickly/daily-build quickly/ppa
20-
21 quickly shell-completion quickly release foo
22 #
23
24@@ -227,9 +221,6 @@
25 quickly shell-completion quickly share -
26 # --help --ppa --staging --template --verbose --version -h -t
27
28-quickly shell-completion quickly share --ppa quickly/
29-# quickly/daily-build quickly/ppa
30-
31 quickly shell-completion quickly share foo
32 #
33
34
35=== modified file 'quickly/test/quickly.sh'
36--- quickly/test/quickly.sh 2011-03-02 22:59:32 +0000
37+++ quickly/test/quickly.sh 2011-11-05 23:40:28 +0000
38@@ -7,7 +7,7 @@
39 # Usage: quickly quickly [origin-template] destination-template
40
41 export HOME=/tmp/quickly-test; quickly quickly ubuntu-application test-template
42-# Copy ubuntu-application to create new /tmp/quickly-test/quickly-templates/test-template template
43+# Creating /tmp/quickly-test/quickly-templates/test-template template from ubuntu-application
44
45 export HOME=/tmp/quickly-test; quickly quickly ubuntu-application test-template
46 # /tmp/quickly-test/quickly-templates/test-template already exists.
47
48=== modified file 'quickly/test/version.sh'
49--- quickly/test/version.sh 2011-06-08 13:48:05 +0000
50+++ quickly/test/version.sh 2011-11-05 23:40:28 +0000
51@@ -13,7 +13,7 @@
52 #
53 # Copyright 2009 Rick Spencer
54 # Copyright 2009-2011 Didier Roche
55-# Copyright 2010-2011 Michael Terry
56+# Copyright 2010-2011 Canonical Ltd
57 # https://launchpad.net/quickly
58 #
59 # quickly comes with ABSOLUTELY NO WARRANTY. quickly is free software, and

Subscribers

People subscribed via source and target branches