Ubuntu CI Dashboard

Merge lp://staging/~cjohnston/qa-dashboard/devel into lp://staging/qa-dashboard

devel
Merge into dev

Proposed by Chris Johnston on 2013-10-28

Status:	Merged
Approved by:	Joe Talbott on 2013-10-28
Approved revision:	670
Merged at revision:	669
Proposed branch:	lp://staging/~cjohnston/qa-dashboard/devel
Merge into:	lp://staging/qa-dashboard
Diff against target:	35 lines (+3/-4) 2 files modified common/tests/test_instance.py (+2/-3) qa_dashboard/settings.py (+1/-1)
To merge this branch:	bzr merge lp://staging/~cjohnston/qa-dashboard/devel
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2013-10-28
Joe Talbott		2013-10-28	Approve on 2013-10-28
Chris Johnston			Needs Resubmitting on 2013-10-28
Review via email: mp+192873@code.staging.launchpad.net

Commit message

Change default configuration to devel

Description of the change

With the coming implementation of statsd in order to get graphite stats for the dashboard, we want to define between a devel instance, a staging instance, and production instance in order to collect stats from staging and production, but not from devel.

Revision history for this message

Joe Talbott (joetalbott) wrote on 2013-10-28:

review: Approve

Revision history for this message

Chris Johnston (cjohnston) wrote on 2013-10-28:

The attempt to merge lp:~cjohnston/qa-dashboard/devel into lp:qa-dashboard failed. Below is the output from the failed tests.

Creating test database for alias 'default'...
Destroying test database for alias 'default'...

/usr/lib/python2.7/dist-packages/django/conf/urls/defaults.py:3: DeprecationWarning: django.conf.urls.defaults is deprecated; use django.conf.urls instead
DeprecationWarning)

....................................................FF.....................WARNING:root:extension: 'error'
.......................................................................................................................................................................
======================================================================
FAIL: test_instance_banner_tag_exports_details (common.tests.test_instance.TestInstanceTags)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/ubuntu/dash/common/tests/test_instance.py", line 50, in test_instance_banner_tag_exports_details
instance_banner()
AssertionError: {'configuration': 'staging'} != {'configuration': 'devel'}
- {'configuration': 'staging'}
? ^^^^^^^

+ {'configuration': 'devel'}
? ^^^^^

======================================================================
FAIL: test_instance_banner_tag_rendered_in_development (common.tests.test_instance.TestInstanceTags)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/ubuntu/dash/common/tests/test_instance.py", line 63, in test_instance_banner_tag_rendered_in_development
    rendered
  File "/home/ubuntu/dash/common/tests/test_instance.py", line 39, in assertIn
    item2
AssertionError: '<p>You are accessing the <strong>staging</strong> instance of the <strong>CI Dashboard</strong>' not in u'\n <div class="staging-banner-under"></div>\n <div id="instance" class="staging-banner">\n <p>You are accessing the <strong>devel</strong> instance of the <strong>CI Dashboard</strong>. This should only be used for testing or training.</p>\n <p>Please use the <strong>production</strong> instance instead: <a href="http://reports.qa.ubuntu.com" title="CI Dashboard">http://reports.qa.ubuntu.com</a>.</p>\n </div>\n\n'

----------------------------------------------------------------------
Ran 242 tests in 16.942s

FAILED (failures=2)

The attempt to merge lp:~cjohnston/qa-dashboard/devel into lp:qa-dashboard failed. Below is the output from the failed tests.

Creating test database for alias 'default'...
Destroying test database for alias 'default'...

/usr/lib/python2.7/dist-packages/django/conf/urls/defaults.py:3: DeprecationWarning: django.conf.urls.defaults is deprecated; use django.conf.urls instead
  DeprecationWarning)

....................................................FF.....................WARNING:root:extension: 'error'
.......................................................................................................................................................................
======================================================================
FAIL: test_instance_banner_tag_exports_details (common.tests.test_instance.TestInstanceTags)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/ubuntu/dash/common/tests/test_instance.py", line 50, in test_instance_banner_tag_exports_details
    instance_banner()
AssertionError: {'configuration': 'staging'} != {'configuration': 'devel'}
- {'configuration': 'staging'}
?                    ^^^^^^^

+ {'configuration': 'devel'}
?                    ^^^^^

======================================================================
FAIL: test_instance_banner_tag_rendered_in_development (common.tests.test_instance.TestInstanceTags)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/ubuntu/dash/common/tests/test_instance.py", line 63, in test_instance_banner_tag_rendered_in_development
    rendered
  File "/home/ubuntu/dash/common/tests/test_instance.py", line 39, in assertIn
    item2
AssertionError: '<p>You are accessing the <strong>staging</strong> instance of the <strong>CI Dashboard</strong>' not in u'\n    <div class="staging-banner-under"></div>\n    <div id="instance" class="staging-banner">\n        <p>You are accessing the <strong>devel</strong> instance of the <strong>CI Dashboard</strong>. This should only be used for testing or training.</p>\n        <p>Please use the <strong>production</strong> instance instead: <a href="http://reports.qa.ubuntu.com" title="CI Dashboard">http://reports.qa.ubuntu.com</a>.</p>\n    </div>\n\n'

----------------------------------------------------------------------
Ran 242 tests in 16.942s

FAILED (failures=2)

Revision history for this message

Chris Johnston (cjohnston) on 2013-10-28:

review: Needs Resubmitting

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-28:

FAILED: Continuous integration, rev:669
http://10.97.0.26:8080/job/dashboard-ci/238/
Executed test runs:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/dashboard-ci/238/rebuild

review: Needs Fixing (continuous-integration)

lp://staging/~cjohnston/qa-dashboard/devel updated on 2013-10-28