Merge lp:~wesmason/u1-test-utils/fixes-for-django1.6 into lp:u1-test-utils

[Wes Mason]

Add unquoting of current_path for Django 1.6+ compatibility as paths are now returned percent encoded

In django 1.6 paths from urlconf are returned pre-RFC-1738-percent-encoded, and this screws up the path mapping for SST tests.

I've doing a simple unquote which catches all the cases I could throw it at (at least from SSO), and doesn't seem to add any regression issues when I use the branch with a django 1.5.x project (e.g. un-upgraded SSO).

[Ricardo Kirkner (ricardokirkner)]

LGTM

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~wesmason/u1-test-utils/fixes-for-django1.6 into lp:u1-test-utils failed. Below is the output from the failed tests.

Setting up the virtual environment.
[localhost] local: which virtualenv
[localhost] local: /usr/bin/python /usr/bin/virtualenv --version
[localhost] local: /usr/bin/python /usr/bin/virtualenv --distribute --clear --no-site-packages .env
The --no-site-packages flag is deprecated; it is now the default behavior.
Not deleting .env/bin
New python executable in .env/bin/python
Installing distribute.............................................................................................................................................................................................done.
Installing pip...............done.
[localhost] local: . /mnt/tarmac/cache/u1-test-utils/trunk/.env/bin/activate && pip install -U -r requirements.txt
Downloading/unpacking bzr+ssh://bazaar.launchpad.net/~bloodearnest/localmail/trunk@36 (from -r requirements.txt (line 9))
  Checking out bzr+ssh://bazaar.launchpad.net/~bloodearnest/localmail/trunk (to revision 36) to /tmp/pip-dFpy9z-build
  Running setup.py egg_info for package from bzr+ssh://bazaar.launchpad.net/~bloodearnest/localmail/trunk@36

Downloading/unpacking bzr+http://bazaar.launchpad.net/~ubuntuone-hackers/payclient/trunk@4 (from -r requirements.txt (line 10))
  Checking out http://bazaar.launchpad.net/~ubuntuone-hackers/payclient/trunk (to revision 4) to /tmp/pip-WTY2mS-build
  Running setup.py egg_info for package from bzr+http://bazaar.launchpad.net/~ubuntuone-hackers/payclient/trunk@4

    warning: no previously-included files matching '*.pyc' found anywhere in distribution
Downloading/unpacking bzr+http://bazaar.launchpad.net/~canonical-isd-qa/selenium-simple-test/trunk@tag:sst-0.2.4 (from -r requirements.txt (line 11))
  Checking out http://bazaar.launchpad.net/~canonical-isd-qa/selenium-simple-test/trunk (to revision tag:sst-0.2.4) to /tmp/pip-T3qRri-build
  Running setup.py egg_info for package from bzr+http://bazaar.launchpad.net/~canonical-isd-qa/selenium-simple-test/trunk@tag:sst-0.2.4

    warning: no files found matching 'testproj.db.original' under directory 'src/testproject'
Downloading/unpacking bzr+http://bazaar.launchpad.net/~canonical-isd-hackers/canonical-identity-provider/ssoclient@3 (from -r requirements.txt (line 12))
  Checking out http://bazaar.launchpad.net/~canonical-isd-hackers/canonical-identity-provider/ssoclient (to revision 3) to /tmp/pip-F9n5N0-build
  Running setup.py egg_info for package from bzr+http://bazaar.launchpad.net/~canonical-isd-hackers/canonical-identity-provider/ssoclient@3

Downloading/unpacking beautifulsoup4 (from -r requirements.txt (line 2))
  Running setup.py egg_info for package beautifulsoup4

Downloading/unpacking django==1.4 (from -r requirements.txt (line 3))
  Running setup.py egg_info for package django

Downloading/unpacking mock (from -r requirements.txt (line 4))
  Running setup.py egg_info for package mock

    warning: no files found matching '*.png' under directory 'docs'
    warning: no files found matching '*.css' under directory 'docs'
    warning: no files found match...

[lp:~wesmason/u1-test-utils/fixes-for-django1.6]

100. By Wes Mason on 2014-07-30

PEP8 fixeseseses

=== modified file 'setup_vm/bin/setup_vm.py'
--- setup_vm/bin/setup_vm.py	2013-08-09 09:35:59 +0000
+++ setup_vm/bin/setup_vm.py	2014-07-30 14:50:22 +0000
@@ -20,7 +20,7 @@
     registry,
     transport,
     urlutils,
-    )
+)
 import yaml
 
 # Work around a bug in bzrlib.config forbidding some constructs in templates.
@@ -888,9 +888,10 @@
         console = FileMonitor(self._console_path)
         try:
             for line in console.parse():
-# FIXME: We need some way to activate this dynamically (conf var defaulting to
-# env var OR cmdline parameter ? -- vila 2013-02-11
-#                print "read: [%s]" % (line,) # so useful for debug...
+                # FIXME: We need some way to activate this dynamically (conf
+                # var defaulting to env var OR cmdline parameter ?
+                #   -- vila 2013-02-11
+                #      print "read: [%s]" % (line,) # so useful for debug...
                 pass
         except (ConsoleEOFError, CloudInitError):
             # FIXME: No test covers this path -- vila 2013-02-15
@@ -1084,7 +1085,7 @@
             '--disk', 'path=%s' % (self._seed_path,),
             # We just boot, cloud-init will handle the installs we need
             '--boot', 'hd', '--hvm',
-            ]
+        ]
         run_subprocess(virt_install)
         self.parse_console_during_install(virt_install)
         # We've seen the console signaling halt, but the vm will need a bit

=== modified file 'setup_vm/tests/test_setup_vm.py'
--- setup_vm/tests/test_setup_vm.py	2013-08-13 16:02:29 +0000
+++ setup_vm/tests/test_setup_vm.py	2014-07-30 14:50:22 +0000
@@ -162,11 +162,11 @@
 
 class TestDownload(TestCaseWithHome):
 
-# FIXME: Needs parametrization against
-# vm.{cloud_image_name|cloud_tarball_name|iso_name} and
-# {download_iso|download_cloud_image|download_cloud_tarball} {Lxc|Kvm}... May
-# be we just need to test _download_in_cache() now that it's implemented at Vm
-# level and be done -- vila 2013-08-06
+    # FIXME: Needs parametrization agains
+    # vm.{cloud_image_name|cloud_tarball_name|iso_name} an
+    # {download_iso|download_cloud_image|download_cloud_tarball} {Lxc|Kvm}...
+    # Maybe we just need to test _download_in_cache() now that it's implemented
+    # at V level and be done -- vila 2013-08-06
 
     def setUp(self):
         tests.requires_feature(self, tests.use_sudo_for_tests_feature)
@@ -544,9 +544,11 @@
 chmod 0700 ~ubuntu/setup_vm_post_install
 ''', self.ci_data.ubuntu_hook)
         # The command is run as root, so we need to 'su ubuntu' first
-        self.assertEqual([['su', '-l',
-                          '-c', '~ubuntu/setup_vm_post_install',
-                          'ubuntu']],
+        self.assertEqual([['su',
+                           '-l',
+                           '-c',
+                           '~ubuntu/setup_vm_post_install',
+                           'ubuntu']],
                          self.ci_data.cloud_config['runcmd'])
 
     def test_uploaded_scripts(self):
@@ -579,9 +581,11 @@
 chmod 0700 ~ubuntu/setup_vm_uploads
 ''',
                          self.ci_data.uploaded_scripts_hook)
-        self.assertEqual([['su', '-l',
-                          '-c', '~ubuntu/setup_vm_uploads',
-                          'ubuntu']],
+        self.assertEqual([['su',
+                           '-l',
+                           '-c',
+                           '~ubuntu/setup_vm_uploads',
+                           'ubuntu']],
                          self.ci_data.cloud_config['runcmd'])
 
 

=== modified file 'u1testutils/sst/__init__.py'
--- u1testutils/sst/__init__.py	2013-07-03 07:22:10 +0000
+++ u1testutils/sst/__init__.py	2014-07-30 14:50:22 +0000
@@ -19,6 +19,7 @@
 import sst.actions
 
 from functools import wraps
+from urllib2 import unquote
 
 
 logger = logging.getLogger('User test')
@@ -143,7 +144,7 @@
 
     def _get_current_url_path(self):
         current_url = sst.actions.get_current_url()
-        return urlparse.urlparse(current_url).path
+        return unquote(urlparse.urlparse(current_url).path)
 
     def assert_headings1(self):
         """Assert the h1 elements of the page."""