Merge lp:~ralsina/ubuntuone-control-panel/truncate-argv into lp:ubuntuone-control-panel

[Roberto Alsina]

 - Truncate the argument list at argv[0] before passing to argparse (LP: #956143).

 - Truncate the argument list at argv[0] before passing to argparse (LP: #956143).

If testing on windows, some tests apparently get stuck but these pass. I am fixing all tests suites in subsequent branches.

[lp:~ralsina/ubuntuone-control-panel/truncate-argv]

286. By Roberto Alsina on 2012-03-15

forgot half a test

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Brian Curtin (brian.curtin)]

looks good

review: Approve

=== modified file 'ubuntuone/controlpanel/gui/qt/main/__init__.py'
--- ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-03-10 18:15:33 +0000
+++ ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-03-15 17:08:19 +0000
@@ -63,7 +63,7 @@
     # The following cannot be imported outside this function
     # because u1trial already provides a reactor.
 
-    args = ['ubuntuone-installer'] + args[1:]
+    args = ['ubuntuone-installer'] + args
     app = UniqueApplication(args, "ubuntuone-control-panel")
 
     # Install translator for standard dialogs.
@@ -75,7 +75,10 @@
 
     parser = parser_options()
     # Use only the arguments that are not recognized by Qt
-    args = parser.parse_args(args=[unicode(x) for x in app.arguments()[1:]])
+    # and after the name of the binary (bug #956143)
+    arg_list = [unicode(arg) for arg in app.arguments()]
+    bin_position = arg_list.index(sys.argv[0]) + 1
+    args = parser.parse_args(args=arg_list[bin_position:])
     switch_to = args.switch_to
     minimized = args.minimized
     with_icon = args.with_icon

=== modified file 'ubuntuone/controlpanel/gui/qt/main/tests/test_main.py'
--- ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-03-10 18:38:09 +0000
+++ ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-03-15 17:08:19 +0000
@@ -16,6 +16,8 @@
 
 """Tests for the control panel's Qt main."""
 
+import sys
+
 from PyQt4 import QtCore
 from twisted.internet.defer import inlineCallbacks
 
@@ -111,44 +113,52 @@
         self.start = FakeStart()
         self.patch(main, "UniqueApplication", self.app)
         self.patch(main, "start", self.start)
+        self.patch(main.source, "main_start", lambda app: None)
         self.patch(QtCore, "QTranslator", lambda: self.translator)
 
     def test_wm_class(self):
         """Test that we set the 1st argument, used for WM_CLASS, correctly."""
-        main.main([])
+        main.main([sys.argv[0]])
         self.assertEqual(self.app.args,
-            (['ubuntuone-installer'], ('ubuntuone-control-panel',), {}))
+            (['ubuntuone-installer', sys.argv[0]],
+            ('ubuntuone-control-panel',), {}))
 
     def test_title_not_fail(self):
-        """Ensure -title is removed before it gets to OptParser."""
-        main.main(["blah", "-title"])
+        """Ensure -title is removed before it gets to argparse."""
+        main.main([sys.argv[0], "-title"])
         # Did not crash!
 
+    def test_truncate_argv(self):
+        """Ensure the binary name is not given to argparse."""
+        main.main(["foo", "bar", sys.argv[0], "--minimized"])
+        self.assertEqual(self.start.args[1],
+            {'minimized': True, 'with_icon': False})
+
     def test_minimized_option(self):
         """Ensure the --minimized option is parsed and passed correctly."""
-        main.main(["blah", "--minimized"])
+        main.main([sys.argv[0], "--minimized"])
         self.assertEqual(self.start.args[1],
             {'minimized': True, 'with_icon': False})
 
     def test_with_icon_option(self):
         """Ensure the --minimized option is parsed and passed correctly."""
-        main.main(["blah", "--with-icon"])
+        main.main([sys.argv[0], "--with-icon"])
         self.assertEqual(self.start.args[1],
             {'minimized': False, 'with_icon': True})
 
     def test_style_loads(self):
         """Ensure the stylesheet is loaded."""
-        main.main([])
+        main.main([sys.argv[0]])
         self.assertTrue(self.app.style)
 
     def test_switch_to_option(self):
         """Ensure the --switch-to option is parsed and passed correctly."""
-        main.main(["foobar", "--switch-to", "folders"])
+        main.main([sys.argv[0], "--switch-to", "folders"])
         self.assertEqual(self.start.window.tabname, "folders")
 
     def test_translator(self):
         """Ensure the Qt translator is loaded."""
-        main.main(["foo"])
+        main.main([sys.argv[0]])
         locale = unicode(QtCore.QLocale.system().name())
         self.assertEqual(self.app.translator, self.translator)
         self.assertEqual(self.translator.args, (("qt_" + locale,