Ubuntu Software Center

Merge lp:~davmor2/software-center/remove_two_lines into lp:software-center

  1. remove_two_lines
  2. Merge into trunk
Proposed by Dave Morley
Status: Merged
Merged at revision: 2962
Proposed branch: lp:~davmor2/software-center/remove_two_lines
Merge into: lp:software-center
Diff against target: 15 lines (+1/-3)
1 file modified
contrib/USC-start-stop-times.py (+1/-3)
To merge this branch: bzr merge lp:~davmor2/software-center/remove_two_lines
Reviewer Review Type Date Requested Status
Gary Lasker (community) Approve
Review via email: mp+101608@code.launchpad.net

Description of the change

This is a minor change, there were a couple of lines in my contrib/USC-start-stop-times.py that were to try out a feature that wasn't working in USC so pointed to another app (xchat)

Also I added ./ to the ldtp.launchapp command so when run in trunk it triggers the trunk version of the software-center rather than the installed version, ie when run from trunk you will now get ./software-center called as the launching app rather than the current which is just software-center.

To post a comment you must log in.
Revision history for this message
Gary Lasker (gary-lasker) wrote :

Looks good to me! Approved and merged. Thanks a lot, Dave!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'contrib/USC-start-stop-times.py'
2--- contrib/USC-start-stop-times.py 2012-03-26 15:10:41 +0000
3+++ contrib/USC-start-stop-times.py 2012-04-11 17:07:32 +0000
4@@ -10,10 +10,8 @@
5 class TestCaseUSCStartStop(unittest.TestCase):
6
7 def setUp(self):
8- ldtp.launchapp('software-center')
9+ ldtp.launchapp('./software-center')
10 assert ldtp.waittillguiexist('frmUbuntuSoftwareCent*')
11- print sorted(ldtp.getapplist())
12- print ldtp.getmemorystat('xchat')
13 self.msgs = []
14 a = "Time taken for the frame to open is " + str(
15 time.time() - start_time)