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

[Dave Morley]

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.

[Gary Lasker (gary-lasker)]

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

review: Approve

=== modified file 'contrib/USC-start-stop-times.py'
--- contrib/USC-start-stop-times.py	2012-03-26 15:10:41 +0000
+++ contrib/USC-start-stop-times.py	2012-04-11 17:07:32 +0000
@@ -10,10 +10,8 @@
 class TestCaseUSCStartStop(unittest.TestCase):
 
     def setUp(self):
-        ldtp.launchapp('software-center')
+        ldtp.launchapp('./software-center')
         assert ldtp.waittillguiexist('frmUbuntuSoftwareCent*')
-        print sorted(ldtp.getapplist())
-        print ldtp.getmemorystat('xchat')
         self.msgs = []
         a = "Time taken for the frame to open is " + str(
             time.time() - start_time)