Merge lp:~elopio/canonical-identity-provider/fix_private_teams into lp:canonical-identity-provider/release

[Leo Arias]

Fix the return private teams tests.

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~elopio/canonical-identity-provider/fix_private_teams into lp:canonical-identity-provider failed. Below is the output from the failed tests.

Updating download cache at dir /mnt/tarmac/isd-download-cache
Using saved parent location: bzr+ssh://bazaar.launchpad.net/~canonical-isd-hackers/+junk/download-cache/
No revisions or tags to pull.
[localhost] local: which virtualenv
[localhost] local: /usr/bin/python /usr/bin/virtualenv --version
[localhost] local: /usr/bin/python /usr/bin/virtualenv --distribute --clear .env
Not deleting .env/bin
New python executable in .env/bin/python
Installing distribute.............................................................................................................................................................................................done.
Installing pip...............done.
[localhost] local: dpkg -l libpq-dev 2> /dev/null | grep '^ii' | wc -l
[localhost] local: dpkg -l libxml2-dev 2> /dev/null | grep '^ii' | wc -l
[localhost] local: dpkg -l libxslt1-dev 2> /dev/null | grep '^ii' | wc -l
[localhost] local: dpkg -l memcached 2> /dev/null | grep '^ii' | wc -l
[localhost] local: dpkg -l postgresql-plpython-9.1 2> /dev/null | grep '^ii' | wc -l
[localhost] local: dpkg -l python-dev 2> /dev/null | grep '^ii' | wc -l
[localhost] local: dpkg -l python-m2crypto 2> /dev/null | grep '^ii' | wc -l
[localhost] local: dpkg -l swig 2> /dev/null | grep '^ii' | wc -l
[localhost] local: dpkg -l config-manager 2> /dev/null | grep '^ii' | wc -l
[localhost] local: dpkg -l python-egenix-mx-base-dev 2> /dev/null | grep '^ii' | wc -l
[localhost] local: rm -rf M2Crypto*
[localhost] local: ln -s /usr/lib/python2.7/dist-packages/M2Crypto* .
[localhost] local: /usr/lib/config-manager/cm.py update /tmp/tmpEJ54ca
[localhost] local: . /mnt/tarmac/cache/canonical-identity-provider/.env/bin/activate && make install PACKAGES="-r /mnt/tarmac/cache/canonical-identity-provider/requirements.txt"
pip install --find-links=file:///mnt/tarmac/isd-download-cache --no-index pip==dev
Ignoring indexes: http://pypi.python.org/simple/
Downloading/unpacking pip==dev
  Running setup.py egg_info for package pip

    warning: no files found matching '*.html' under directory 'docs'
    warning: no previously-included files matching '*.txt' found under directory 'docs/_build'
    no previously-included directories found matching 'docs/_build/_sources'
Installing collected packages: pip
  Found existing installation: pip 1.1
    Uninstalling pip:
      Successfully uninstalled pip
  Running setup.py install for pip

    warning: no files found matching '*.html' under directory 'docs'
    warning: no previously-included files matching '*.txt' found under directory 'docs/_build'
    no previously-included directories found matching 'docs/_build/_sources'
    Installing pip script to /mnt/tarmac/cache/canonical-identity-provider/.env/bin
    Installing pip-2.7 script to /mnt/tarmac/cache/canonical-identity-provider/.env/bin
Successfully installed pip
Cleaning up...
pip install --find-links=. --no-index -r /mnt/tarmac/cache/canonical-identity-provider/requirements.txt
Ignoring indexes: http://pypi.python.org/simple/
Do...

=== modified file 'acceptance/helpers.py'
--- acceptance/helpers.py	2013-05-02 17:20:14 +0000
+++ acceptance/helpers.py	2013-05-17 20:48:27 +0000
@@ -250,6 +250,7 @@
     # TODO we also need the user name.
     user = data.User('TODO', email, password)
     site_not_recognized = log_in.log_in_to_site_not_recognized(user)
+    site_not_recognized.make_all_information_available_to_website()
     site_not_recognized.yes_sign_me_in()
 
 

=== modified file 'requirements/testing.txt'
--- requirements/testing.txt	2013-05-10 14:56:11 +0000
+++ requirements/testing.txt	2013-05-17 20:48:27 +0000
@@ -29,5 +29,5 @@
 zope.schema==4.2.0
 zope.testbrowser==3.5.1
 bzr+http://bazaar.launchpad.net/~canonical-isd-qa/selenium-simple-test/trunk/@376
-bzr+http://bazaar.launchpad.net/~canonical-isd-hackers/u1-test-utils/trunk@65
+bzr+http://bazaar.launchpad.net/~canonical-isd-hackers/u1-test-utils/trunk@69
 bzr+ssh://bazaar.launchpad.net/~bloodearnest/+junk/test-email-server/