Merge lp:~ralsina/ubuntuone-control-panel/darwicon into lp:ubuntuone-control-panel

[Roberto Alsina]

- Made --with-icon the default on Darwin

Make --with-icon the default on Darwin, since there we can't control how u1cp is started.

[dobey (dobey)]

Looks fine to me.

review: Approve

[Mike McCracken (mikemc)]

the newly added tests pass, works IRL.

review: Approve

=== modified file 'ubuntuone/controlpanel/gui/qt/main/__init__.py'
--- ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-08-24 18:48:48 +0000
+++ ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-08-30 18:36:18 +0000
@@ -110,7 +110,9 @@
     args = parser.parse_args(args=arg_list[bin_position:])
     switch_to = args.switch_to
     minimized = args.minimized
-    with_icon = args.with_icon
+    # On Darwin, because of how apps are started, we need
+    # this by default.
+    with_icon = args.with_icon or sys.platform == 'darwin'
     installer = args.installer
     source.main(app)
 

=== modified file 'ubuntuone/controlpanel/gui/qt/main/tests/test_main.py'
--- ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-08-24 19:27:34 +0000
+++ ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-08-30 18:36:18 +0000
@@ -186,18 +186,35 @@
 
     def test_truncate_argv(self):
         """Ensure the binary name is not given to argparse."""
+        self.patch(sys, 'platform', 'not-darwin')
         main.main(["foo", "bar", sys.argv[0], "--minimized"])
         self.assertEqual(self.start.args[1],
             {'minimized': True, 'with_icon': False, 'installer': False})
 
+    def test_darwin_defult_is_with_icon(self):
+        """On Darwin, the default is to show the icon."""
+        self.patch(sys, 'platform', 'darwin')
+        main.main([sys.argv[0]])
+        self.assertEqual(self.start.args[1],
+            {'minimized': False, 'with_icon': True, 'installer': False})
+
+    def test_not_darwin_defult_is_with_icon(self):
+        """On Not-darwin, the default is to not show the icon."""
+        self.patch(sys, 'platform', 'not-darwin')
+        main.main([sys.argv[0]])
+        self.assertEqual(self.start.args[1],
+            {'minimized': False, 'with_icon': False, 'installer': False})
+
     def test_minimized_option(self):
         """Ensure the --minimized option is parsed and passed correctly."""
+        self.patch(sys, 'platform', 'not-darwin')
         main.main([sys.argv[0], "--minimized"])
         self.assertEqual(self.start.args[1],
             {'minimized': True, 'with_icon': False, 'installer': False})
 
     def test_with_icon_option(self):
         """Ensure the --minimized option is parsed and passed correctly."""
+        self.patch(sys, 'platform', 'not-darwin')
         main.main([sys.argv[0], "--with-icon"])
         self.assertEqual(self.start.args[1],
             {'minimized': False, 'with_icon': True, 'installer': False})
@@ -218,12 +235,14 @@
 
     def test_installer_option(self):
         """Ensure the --installer option is parsed and passed correctly."""
+        self.patch(sys, 'platform', 'not-darwin')
         main.main([sys.argv[0], "--installer"])
         self.assertEqual(self.start.args[1],
             {'minimized': False, 'with_icon': False, 'installer': True})
 
     def test_minimized_with_icon_options(self):
         """Ensure you can be minimized and with icon at the same time."""
+        self.patch(sys, 'platform', 'not-darwin')
         main.main([sys.argv[0], "--minimized", "--with-icon"])
         self.assertEqual(self.start.args[1],
             {'minimized': True, 'with_icon': True, 'installer': False})