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

Proposed by Anthony Lenton
Status: Merged
Merged at revision: 94
Proposed branch: lp:~canonical-isd-hackers/canonical-identity-provider/logo-left
Merge into: lp:canonical-identity-provider/release
Diff against target: 25 lines (+3/-1)
2 files modified
identityprovider/media/ubuntu/styles.css (+1/-1)
identityprovider/tests/test_command_cleanup.py (+2/-0)
To merge this branch: bzr merge lp:~canonical-isd-hackers/canonical-identity-provider/logo-left
Reviewer Review Type Date Requested Status
Łukasz Czyżykowski (community) Approve
Review via email: mp+39888@code.launchpad.net

Commit message

Move the logo over to the left side on the Ubuntu theme.

Description of the change

This is just a small template fix, to place the logo on the left side of the Ubuntu template, per related bug's request.

To post a comment you must log in.
Revision history for this message
Łukasz Czyżykowski (lukasz-czyzykowski) wrote :

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

Revision history for this message
Łukasz Czyżykowski (lukasz-czyzykowski) wrote :

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

review: Approve
Revision history for this message
Canonical ISD bug wrangler (isd-bug-wrangler) wrote :

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

Revision history for this message
Łukasz Czyżykowski (lukasz-czyzykowski) wrote :

Changed tarmac config. Running it once again.

review: Approve
Revision history for this message
Canonical ISD bug wrangler (isd-bug-wrangler) wrote :

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.

Revision history for this message
Łukasz Czyżykowski (lukasz-czyzykowski) wrote :

And another go.

review: Approve
Revision history for this message
Canonical ISD bug wrangler (isd-bug-wrangler) wrote :
Download full text (4.5 KiB)

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(...

Read more...

Revision history for this message
Anthony Lenton (elachuni) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'identityprovider/media/ubuntu/styles.css'
2--- identityprovider/media/ubuntu/styles.css 2010-09-17 14:31:58 +0000
3+++ identityprovider/media/ubuntu/styles.css 2010-11-02 19:46:51 +0000
4@@ -90,7 +90,7 @@
5 background-image: url(/assets/identityprovider/ubuntu/header_logo.png);
6 background-repeat: no-repeat;
7 height: 37px;
8- left: 636px;
9+ left: 16px;
10 margin: 0;
11 padding: 0;
12 position: absolute;
13
14=== modified file 'identityprovider/tests/test_command_cleanup.py'
15--- identityprovider/tests/test_command_cleanup.py 2010-10-11 21:27:05 +0000
16+++ identityprovider/tests/test_command_cleanup.py 2010-11-02 19:46:51 +0000
17@@ -17,6 +17,8 @@
18 openidassociation CASCADE""")
19 connection.connection.commit()
20
21+ setUp = tearDown
22+
23 def test_cleanup(self):
24 call_command('populate', accounts=0, sessions=500,
25 nonces=500, associations=500, verbosity=0)