Merge lp:~dobey/u1sync/fix-api-break into lp:u1sync

[dobey]

Fix to work with the new storage-protocol API to validate hostname properly

[Manuel de la Peña (mandel)]

review: Approve

[Roberto Alsina (ralsina)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/u1sync/fix-api-break into lp:u1sync failed. Below is the output from the failed tests.

./run-tests: line 19: u1trial: command not found

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/u1sync/fix-api-break into lp:u1sync failed. Below is the output from the failed tests.

                                                                        [ERROR]
u1sync.tests.test_merge
  MergeTest
    test_clobber ... [OK]
    test_generic_merge ... [OK]
    test_sync ... [OK]

===============================================================================
[ERROR]: u1sync.tests.test_client

Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/twisted/trial/runner.py", line 563, in loadPackage
    module = modinfo.load()
  File "/usr/lib/python2.6/dist-packages/twisted/python/modules.py", line 381, in load
    return self.pathEntry.pythonPath.moduleLoader(self.name)
  File "/usr/lib/python2.6/dist-packages/twisted/python/reflect.py", line 464, in namedAny
    topLevelPackage = _importAndCheckStack(trialname)
  File "/mnt/tarmac/cache/u1sync/trunk/u1sync/tests/test_client.py", line 20, in <module>
    from mocker import Mocker
exceptions.ImportError: No module named mocker
-------------------------------------------------------------------------------
Ran 3 tests in 0.181s

FAILED (errors=1, successes=3)

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/u1sync/fix-api-break into lp:u1sync failed. Below is the output from the failed tests.

                                                                        [ERROR]
u1sync.tests.test_merge
  MergeTest
    test_clobber ... [OK]
    test_generic_merge ... [OK]
    test_sync ... [OK]

===============================================================================
[ERROR]: u1sync.tests.test_client

Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/twisted/trial/runner.py", line 563, in loadPackage
    module = modinfo.load()
  File "/usr/lib/python2.6/dist-packages/twisted/python/modules.py", line 381, in load
    return self.pathEntry.pythonPath.moduleLoader(self.name)
  File "/usr/lib/python2.6/dist-packages/twisted/python/reflect.py", line 464, in namedAny
    topLevelPackage = _importAndCheckStack(trialname)
  File "/mnt/tarmac/cache/u1sync/trunk/u1sync/tests/test_client.py", line 23, in <module>
    from u1sync import client
  File "/mnt/tarmac/cache/u1sync/trunk/u1sync/client.py", line 35, in <module>
    from ubuntuone.platform.xdg_base_directory import ubuntuone_log_dir
exceptions.ImportError: No module named platform.xdg_base_directory
-------------------------------------------------------------------------------
Ran 3 tests in 0.008s

FAILED (errors=1, successes=3)

=== modified file 'run-tests'
--- run-tests	2011-02-09 17:46:32 +0000
+++ run-tests	2012-06-18 14:28:18 +0000
@@ -16,8 +16,7 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 set -e
 
-u1trial -c u1sync
-USE_PYFLAKES=1 u1lint
+trial u1sync
+pyflakes u1sync bin/u1sync
 rm -rf _trial_temp
-rm -rf .coverage
 

=== modified file 'u1sync/client.py'
--- u1sync/client.py	2011-09-01 12:48:57 +0000
+++ u1sync/client.py	2012-06-18 14:28:18 +0000
@@ -325,7 +325,7 @@
         """Connect to host/port using ssl."""
         def _connect():
             """deferred part."""
-            ctx = get_ssl_context(no_verify)
+            ctx = get_ssl_context(no_verify, host)
             self.reactor.connectSSL(host, port, self.factory, ctx)
         self._connect_inner(_connect)