Merge lp:~brian.curtin/ubuntu-sso-client/correct-subprocess-args into lp:ubuntu-sso-client

[Brian Curtin]

- Remove an extra insertion of "python" to command line arguments on Windows.

Remove an extra inserted "python" argument at the front of a command argument list.

On Windows, we were inserting "python" at the front and then passing the list off to ubuntu_sso.utils.runner.qt.spawn_program. That function has a special case on Windows where it uses procutils.which to find the full path to the python executable it should be using. We were then inserting that path at the front of the list, so we ended up with "python" as an argument to "C:\u1\bin\python".

[Mike McCracken (mikemc)]

On my win7 vm, many tests fail/err, but it's the same proxy related ones as on trunk.

Otherwise, works for me as long as I fix the issue with logging.conf that will be fixed by an upcoming branch, see bug #1067489

review: Approve

[dobey (dobey)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~brian.curtin/ubuntu-sso-client/correct-subprocess-args into lp:ubuntu-sso-client failed. Below is the output from the failed tests.

*** Running QT test suite for ubuntu_sso ***
running build
Compiled data/qt/proxy_credentials_dialog.ui into ubuntu_sso/qt/ui/proxy_credentials_dialog_ui.py
compiled data/qt/resources.qrc into ubuntu_sso/qt/ui/resources_rc.py
Compiled data/qt/setup_account.ui into ubuntu_sso/qt/ui/setup_account_ui.py
Compiled data/qt/reset_password.ui into ubuntu_sso/qt/ui/reset_password_ui.py
Compiled data/qt/network_detection.ui into ubuntu_sso/qt/ui/network_detection_ui.py
Compiled data/qt/forgotten_password.ui into ubuntu_sso/qt/ui/forgotten_password_ui.py
Compiled data/qt/ssl_dialog.ui into ubuntu_sso/qt/ui/ssl_dialog_ui.py
Compiled data/qt/success_message.ui into ubuntu_sso/qt/ui/success_message_ui.py
Compiled data/qt/loadingoverlay.ui into ubuntu_sso/qt/ui/loadingoverlay_ui.py
Compiled data/qt/current_user_sign_in.ui into ubuntu_sso/qt/ui/current_user_sign_in_ui.py
Compiled data/qt/error_message.ui into ubuntu_sso/qt/ui/error_message_ui.py
Compiled data/qt/email_verification.ui into ubuntu_sso/qt/ui/email_verification_ui.py
running build_py
creating build
creating build/lib.linux-x86_64-2.7
creating build/lib.linux-x86_64-2.7/ubuntu_sso
copying ubuntu_sso/__init__.py -> build/lib.linux-x86_64-2.7/ubuntu_sso
copying ubuntu_sso/account.py -> build/lib.linux-x86_64-2.7/ubuntu_sso
copying ubuntu_sso/credentials.py -> build/lib.linux-x86_64-2.7/ubuntu_sso
copying ubuntu_sso/logger.py -> build/lib.linux-x86_64-2.7/ubuntu_sso
creating build/lib.linux-x86_64-2.7/ubuntu_sso/tests
copying ubuntu_sso/tests/__init__.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/tests
copying ubuntu_sso/tests/linux.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/tests
copying ubuntu_sso/tests/test_credentials.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/tests
copying ubuntu_sso/tests/test_account.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/tests
creating build/lib.linux-x86_64-2.7/ubuntu_sso/keyring
copying ubuntu_sso/keyring/__init__.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring
copying ubuntu_sso/keyring/linux.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring
copying ubuntu_sso/keyring/pykeyring.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring
creating build/lib.linux-x86_64-2.7/ubuntu_sso/keyring/tests
copying ubuntu_sso/keyring/tests/__init__.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring/tests
copying ubuntu_sso/keyring/tests/test_common.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring/tests
copying ubuntu_sso/keyring/tests/test_linux.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring/tests
copying ubuntu_sso/keyring/tests/test_pykeyring.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring/tests
creating build/lib.linux-x86_64-2.7/ubuntu_sso/main
copying ubuntu_sso/main/__init__.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/main
copying ubuntu_sso/main/glib.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/main
copying ubuntu_sso/main/linux.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/main
copying ubuntu_sso/main/darwin.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/main
copying ubuntu_sso/main/windows.py -> build/lib.lin...

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~brian.curtin/ubuntu-sso-client/correct-subprocess-args into lp:ubuntu-sso-client failed. Below is the output from the failed tests.

*** Running QT test suite for ubuntu_sso ***
running build
Compiled data/qt/proxy_credentials_dialog.ui into ubuntu_sso/qt/ui/proxy_credentials_dialog_ui.py
compiled data/qt/resources.qrc into ubuntu_sso/qt/ui/resources_rc.py
Compiled data/qt/setup_account.ui into ubuntu_sso/qt/ui/setup_account_ui.py
Compiled data/qt/reset_password.ui into ubuntu_sso/qt/ui/reset_password_ui.py
Compiled data/qt/network_detection.ui into ubuntu_sso/qt/ui/network_detection_ui.py
Compiled data/qt/forgotten_password.ui into ubuntu_sso/qt/ui/forgotten_password_ui.py
Compiled data/qt/ssl_dialog.ui into ubuntu_sso/qt/ui/ssl_dialog_ui.py
Compiled data/qt/success_message.ui into ubuntu_sso/qt/ui/success_message_ui.py
Compiled data/qt/loadingoverlay.ui into ubuntu_sso/qt/ui/loadingoverlay_ui.py
Compiled data/qt/current_user_sign_in.ui into ubuntu_sso/qt/ui/current_user_sign_in_ui.py
Compiled data/qt/error_message.ui into ubuntu_sso/qt/ui/error_message_ui.py
Compiled data/qt/email_verification.ui into ubuntu_sso/qt/ui/email_verification_ui.py
running build_py
creating build
creating build/lib.linux-x86_64-2.7
creating build/lib.linux-x86_64-2.7/ubuntu_sso
copying ubuntu_sso/__init__.py -> build/lib.linux-x86_64-2.7/ubuntu_sso
copying ubuntu_sso/account.py -> build/lib.linux-x86_64-2.7/ubuntu_sso
copying ubuntu_sso/credentials.py -> build/lib.linux-x86_64-2.7/ubuntu_sso
copying ubuntu_sso/logger.py -> build/lib.linux-x86_64-2.7/ubuntu_sso
creating build/lib.linux-x86_64-2.7/ubuntu_sso/tests
copying ubuntu_sso/tests/__init__.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/tests
copying ubuntu_sso/tests/linux.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/tests
copying ubuntu_sso/tests/test_credentials.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/tests
copying ubuntu_sso/tests/test_account.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/tests
creating build/lib.linux-x86_64-2.7/ubuntu_sso/keyring
copying ubuntu_sso/keyring/__init__.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring
copying ubuntu_sso/keyring/linux.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring
copying ubuntu_sso/keyring/pykeyring.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring
creating build/lib.linux-x86_64-2.7/ubuntu_sso/keyring/tests
copying ubuntu_sso/keyring/tests/__init__.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring/tests
copying ubuntu_sso/keyring/tests/test_common.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring/tests
copying ubuntu_sso/keyring/tests/test_linux.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring/tests
copying ubuntu_sso/keyring/tests/test_pykeyring.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring/tests
creating build/lib.linux-x86_64-2.7/ubuntu_sso/main
copying ubuntu_sso/main/__init__.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/main
copying ubuntu_sso/main/glib.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/main
copying ubuntu_sso/main/linux.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/main
copying ubuntu_sso/main/darwin.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/main
copying ubuntu_sso/main/windows.py -> build/lib.lin...

[lp:~brian.curtin/ubuntu-sso-client/correct-subprocess-args]

1011. By Brian Curtin on 2012-10-16

Removed unused sys

=== modified file 'ubuntu_sso/utils/__init__.py'
--- ubuntu_sso/utils/__init__.py	2012-08-14 23:15:15 +0000
+++ ubuntu_sso/utils/__init__.py	2012-10-16 21:49:21 +0000
@@ -36,6 +36,7 @@
 from dirspec.utils import get_program_path
 
 from twisted.internet import defer
+from twisted.python import procutils
 
 from ubuntu_sso import (BACKEND_EXECUTABLE,
                         UI_EXECUTABLE_QT,
@@ -132,9 +133,11 @@
 
     # adjust cmd for platforms using buildout-generated python
     # wrappers
-    if getattr(sys, 'frozen', None) is None \
-            and sys.platform in ('win32', 'darwin'):
-        cmd_args.insert(0, 'python')
+    if getattr(sys, 'frozen', None) is None:
+        if sys.platform in ('darwin'):
+            cmd_args.insert(0, 'python')
+        elif sys.platform in ('win32'):
+            cmd_args.insert(0, procutils.which("python.exe")[0])
 
     logger.debug('get_bin_cmd: returning %r', cmd_args)
     return cmd_args

=== modified file 'ubuntu_sso/utils/runner/qt.py'
--- ubuntu_sso/utils/runner/qt.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/runner/qt.py	2012-10-16 21:49:21 +0000
@@ -28,10 +28,7 @@
 # files in the program, then also delete it here.
 """Utility to spawn another program from a plain Qt mainloop."""
 
-import sys
-
 from PyQt4 import QtCore
-from twisted.python import procutils
 
 from ubuntu_sso.logger import setup_logging
 
@@ -81,10 +78,6 @@
     process.error.connect(handle_error)
 
     args = list(args)
-    if sys.platform.startswith("win") and not args[0].endswith("exe"):
-        python_exe = procutils.which("python.exe")
-        if python_exe:
-            args.insert(0, python_exe[0])
     program = args[0]
     argv = args[1:]
     process.start(program, argv)

=== modified file 'ubuntu_sso/utils/runner/tests/test_qt.py'
--- ubuntu_sso/utils/runner/tests/test_qt.py	2012-07-03 20:22:08 +0000
+++ ubuntu_sso/utils/runner/tests/test_qt.py	2012-10-16 21:49:21 +0000
@@ -153,22 +153,3 @@
         yield d
 
         self.assertNotIn(self.process, qt._processes)
-
-    @defer.inlineCallbacks
-    def test_start_process_win_devel(self):
-        """Test the windows devel case."""
-        calls = []
-        fake_python = r"c:\python99\python.exe"
-        self.patch(runner.qt.sys, "platform", "win98")
-        self.patch(runner.qt.procutils, "which", lambda _: [fake_python])
-        self.patch(subprocess, "call", calls.append)
-        self.patch(self, "args", ["bin/program", "arg1", "arg2"])
-
-        d = defer.Deferred()
-        runner.qt.spawn_program(self.args,
-            reply_handler=d.callback, error_handler=lambda **kw: d.errback(kw))
-        yield d
-
-        cmdline = calls[0]
-        self.assertEqual(cmdline[0], fake_python,
-                        "python.exe is added to the command line.")