Merge lp:~dobey/ubuntuone-dev-tools/update-from-trunk into lp:ubuntuone-dev-tools/stable-3-0

[dobey]

[Brian Curtin]

  - Actually install the recently added batch files for Windows.
  - Check the $PATH for python.exe on Windows.

[Rodney Dawes]

  - Add a module for using the new gireactor/gtk3reactor in twisted 12.
  - Fix a trailing whitespace lint error.

[Brian Curtin]

  - Actually install the recently added batch files for Windows.
  - Check the $PATH for python.exe on Windows.

[Rodney Dawes]

  - Add a module for using the new gireactor/gtk3reactor in twisted 12.
  - Fix a trailing whitespace lint error.

[Natalia Bidart (nataliabidart)]

looks good!

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-dev-tools/update-from-trunk into lp:ubuntuone-dev-tools/stable-3-0 failed. Below is the output from the failed tests.

ubuntuone.devtools.tests.test_txcheck
  TestCheckTwistedTestClass
    test_bad_mixin_order ... [OK]
    test_bare_super ... [OK]
    test_inline_callbacks ... [OK]
    test_inline_callbacks_missing ... [OK]
    test_missing_return ... [OK]
    test_no_problems ... [OK]
    test_not_twisted ... [OK]
    test_ok_mixin_order ... [OK]
    test_super_not_called ... [OK]
  TestTwistedCheckSuite
    test_suite_catches_problems ... [OK]
    test_suite_runs_tests ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntuone.devtools.testcases
  BaseTestCase
    runTest ... [OK]
ubuntuone.devtools.tests.test_decorators
  TestSkipBasicDecorators
    test_skip_class ... [OK]
    test_skip_decorators ... [OK]
ubuntuone.devtools.testcases.tests.test_squid_testcase
  ProxyTestCase
    test_auth_url_401 ... [SKIPPED]
    test_auth_url_407 ... [SKIPPED]
    test_auth_url_access ... [SKIPPED]
    test_noauth_url_access ... [SKIPPED]
ubuntuone.devtools.testcases.squid
  SquidTestCase
    runTest ... [SKIPPED]
ubuntuone.devtools.testcases
  BaseTestCase
    runTest ... [OK]
ubuntuone.devtools.services.tests.test_squid
  EnvironTestCase
    test_delete_proxy_settings_present ... [OK]
    test_retrieve_proxy_settings ... [OK]
    test_store_settings ... [OK]
  PathsTestCase
    test_get_auth_temp_path ... [OK]
    test_get_basedir_missing ... [OK]
    test_get_basedir_present ... [OK]
    test_get_spool_temp_path_missing ... [OK]
    test_get_spool_temp_path_present ... [OK]
    test_get_squid_temp_path_missing ... [OK]
    test_get_squid_temp_path_present ... [OK]
  SquidRunnerInitTestCase
    test_htpasswd_missing ... ...

[lp:~dobey/ubuntuone-dev-tools/update-from-trunk]

55. By dobey on 2012-02-07

[Brian Curtin]

  - Actually install the recently added batch files for Windows.
  - Check the $PATH for python.exe on Windows.

[Rodney Dawes]

  - Add a module for using the new gireactor/gtk3reactor in twisted 12.
  - Fix a trailing whitespace lint error.

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2011-02-08 17:54:15 +0000
+++ MANIFEST.in	2012-02-07 14:59:21 +0000
@@ -3,3 +3,4 @@
 include *.pth
 recursive-include data *.conf
 recursive-include man *.1
+recursive-include bin *.bat

=== modified file 'bin/u1lint'
--- bin/u1lint	2011-12-19 22:37:31 +0000
+++ bin/u1lint	2012-02-07 14:59:21 +0000
@@ -38,7 +38,12 @@
     """Return the path where python was installed."""
     assert(sys.platform == 'win32')
     # To get the correct path of the script we need the installation path
-    # of python. To get the isntallation path we read the registry.
+    # of python. To get the installation path we first check on the path,
+    # then read the registry.
+
+    for path in os.getenv("Path", "").split(";"):
+        if os.path.exists(os.path.join(path, "python.exe")):
+            return path
 
     # pylint: disable=F0401
     import _winreg
@@ -78,7 +83,11 @@
     if sys.platform == 'win32':
         if python_path is None:
             python_path = find_python_installation_path()
-        return os.path.join(python_path, 'Scripts', script)
+        # In a buildout the scripts go next to python.exe, no Scripts folder.
+        if os.path.exists(os.path.join(python_path, script)):
+            return os.path.join(python_path, script)
+        else:
+            return os.path.join(python_path, 'Scripts', script)
     else:
         # the default is to return the name of the script beacuse we expect it
         # to be executable and in the path.

=== added file 'ubuntuone/devtools/reactors/gi.py'
--- ubuntuone/devtools/reactors/gi.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/devtools/reactors/gi.py	2012-02-07 14:59:21 +0000
@@ -0,0 +1,28 @@
+# Copyright 2009-2012 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""The introspection based main loop integration reactor for testing."""
+
+REACTOR_URL = 'http://twistedmatrix.com/trac/ticket/4558'
+
+
+def install(options=None):
+    """Install the reactor and parse any options we might need."""
+    reactor_name = None
+    if options is not None and options['gui']:
+        reactor_name = 'twisted.internet.gtk3reactor'
+    else:
+        reactor_name = 'twisted.internet.gireactor'
+
+    glibreactor = __import__(reactor_name, None, None, [''])
+    glibreactor.install()