Merge lp://staging/~canonical-isd-hackers/canonical-identity-provider/logo-left into lp://staging/canonical-identity-provider/release

Why there's change in test_command_cleanup.py? Seems largely unrelated to the change.

Ok, didn't read the commit messages. Looks good. Only thing lacking is the commit message for this MP.

The attempt to merge lp:~canonical-isd-hackers/canonical-identity-provider/logo-left into lp:canonical-identity-provider failed. Below is the output from the failed tests.

Traceback (most recent call last):
  File "/srv/sso/.env/bin/nosetests", line 9, in <module>
    load_entry_point('nose==0.11.2.dev', 'console_scripts', 'nosetests')()
  File "/srv/sso/.env/lib/python2.6/site-packages/nose/core.py", line 113, in __init__
    argv=argv, testRunner=testRunner, testLoader=testLoader)
  File "/usr/lib/python2.6/unittest.py", line 816, in __init__
    self.parseArgs(argv)
  File "/srv/sso/.env/lib/python2.6/site-packages/nose/core.py", line 130, in parseArgs
    self.config.configure(argv, doc=self.usage())
  File "/srv/sso/.env/lib/python2.6/site-packages/nose/config.py", line 324, in configure
    self.plugins.begin()
  File "/srv/sso/.env/lib/python2.6/site-packages/nose/plugins/manager.py", line 93, in __call__
    return self.call(*arg, **kw)
  File "/srv/sso/.env/lib/python2.6/site-packages/nose/plugins/manager.py", line 161, in simple
    result = meth(*arg, **kw)
  File "/srv/sso/.env/lib/python2.6/site-packages/nosedjango/nosedjango.py", line 158, in begin
    settings.DEBUG = False
  File "/srv/sso/.env/lib/python2.6/site-packages/django/utils/functional.py", line 281, in __setattr__
    self._setup()
  File "/srv/sso/.env/lib/python2.6/site-packages/django/conf/__init__.py", line 40, in _setup
    self._wrapped = Settings(settings_module)
  File "/srv/sso/.env/lib/python2.6/site-packages/django/conf/__init__.py", line 75, in __init__
    raise ImportError, "Could not import settings '%s' (Is it on sys.path? Does it have syntax errors?): %s" % (self.SETTINGS_MODULE, e)
ImportError: Could not import settings 'settings' (Is it on sys.path? Does it have syntax errors?): No module named settings

Changed tarmac config. Running it once again.

The attempt to merge lp:~canonical-isd-hackers/canonical-identity-provider/logo-left into lp:canonical-identity-provider failed. Below is the output from the failed tests.

sed: -e expression #1, char 39: unterminated `s' command
Got an error creating the test database: database "test_launchpad_dev" already exists

Got an error recreating the test database: database "test_launchpad_dev" is being accessed by other users
DETAIL: There are 1 other session(s) using the database.

And another go.

The attempt to merge lp:~canonical-isd-hackers/canonical-identity-provider/logo-left into lp:canonical-identity-provider failed. Below is the output from the failed tests.

Got an error creating the test database: database "tarmac_sso_test" already exists

.......................................................Traceback (most recent call last):
  File "/srv/sso/.env/bin/nosetests", line 9, in <module>
    load_entry_point('nose==0.11.2.dev', 'console_scripts', 'nosetests')()
  File "/srv/sso/.env/lib/python2.6/site-packages/nose/core.py", line 113, in __init__
    argv=argv, testRunner=testRunner, testLoader=testLoader)
  File "/usr/lib/python2.6/unittest.py", line 817, in __init__
    self.runTests()
  File "/srv/sso/.env/lib/python2.6/site-packages/nose/core.py", line 192, in runTests
    result = self.testRunner.run(self.test)
  File "/srv/sso/.env/lib/python2.6/site-packages/nose/core.py", line 61, in run
    test(result)
  File "/srv/sso/.env/lib/python2.6/site-packages/nose/suite.py", line 161, in __call__
    return self.run(*arg, **kw)
  File "/srv/sso/.env/lib/python2.6/site-packages/nose/suite.py", line 205, in run
    test(orig)
  File "/srv/sso/.env/lib/python2.6/site-packages/nose/suite.py", line 161, in __call__
    return self.run(*arg, **kw)
  File "/srv/sso/.env/lib/python2.6/site-packages/nose/suite.py", line 205, in run
    test(orig)
  File "/srv/sso/.env/lib/python2.6/site-packages/nose/suite.py", line 161, in __call__
    return self.run(*arg, **kw)
  File "/srv/sso/.env/lib/python2.6/site-packages/nose/suite.py", line 205, in run
    test(orig)
  File "/srv/sso/.env/lib/python2.6/site-packages/nose/suite.py", line 161, in __call__
    return self.run(*arg, **kw)
  File "/srv/sso/.env/lib/python2.6/site-packages/nose/suite.py", line 205, in run
    test(orig)
  File "/srv/sso/.env/lib/python2.6/site-packages/nose/suite.py", line 161, in __call__
    return self.run(*arg, **kw)
  File "/srv/sso/.env/lib/python2.6/site-packages/nose/suite.py", line 205, in run
    test(orig)
  File "/srv/sso/.env/lib/python2.6/site-packages/nose/case.py", line 44, in __call__
    return self.run(*arg, **kwarg)
  File "/srv/sso/.env/lib/python2.6/site-packages/nose/case.py", line 139, in run
    self.afterTest(result)
  File "/srv/sso/.env/lib/python2.6/site-packages/nose/case.py", line 63, in afterTest
    afterTest(self.test)
  File "/srv/sso/.env/lib/python2.6/site-packages/nose/proxy.py", line 101, in afterTest
    self.plugins.afterTest(self.test)
  File "/srv/sso/.env/lib/python2.6/site-packages/nose/plugins/manager.py", line 93, in __call__
    return self.call(*arg, **kw)
  File "/srv/sso/.env/lib/python2.6/site-packages/nose/plugins/manager.py", line 161, in simple
    result = meth(*arg, **kw)
  File "/srv/sso/.env/lib/python2.6/site-packages/nosedjango/nosedjango.py", line 222, in afterTest
    call_command('flush', verbosity=0, interactive=False)
  File "/srv/sso/.env/lib/python2.6/site-packages/django/core/management/__init__.py", line 166, in call_command
    return klass.execute(*args, **defaults)
  File "/srv/sso/.env/lib/python2.6/site-packages/django/core/management/base.py", line 222, in execute
    output = self.handle(...

So it seems that these issues resulted in the changes not being merged in the end at all.

Looking at
http://bazaar.launchpad.net/~canonical-isd-hackers/canonical-identity-provider/2.x-trunk/revision/94
the commit in which these changes should have landed ended up empty.

I'm going to avoid manually merging this and propose a new MP for these changes, to see if it was just a Tarmac glitch.