Merge into dev : dashboard-sru-2-sru : Code : Ubuntu CI Dashboard

Status:	Rejected
Rejected by:	Chris Johnston on 2013-01-08
Proposed branch:	lp://staging/~cjohnston/qa-dashboard/dashboard-sru-2-sru
Merge into:	lp://staging/qa-dashboard
Diff against target:	612 lines (+352/-156) 12 files modified dashboard/migrations/0014_remove_sru_models.py (+18/-0) dashboard/models.py (+0/-132) dashboard/templatetags/__init__.py (+0/-15) qa_dashboard/settings.py (+1/-0) qa_dashboard/urls.py (+7/-7) sru/management/__init__.py (+14/-0) sru/management/commands/__init__.py (+14/-0) sru/management/commands/jenkins_pull_sru.py (+1/-1) sru/migrations/0001_add_initial_models.py (+136/-0) sru/models.py (+144/-0) sru/tests.py (+16/-0) sru/views.py (+1/-1)
To merge this branch:	bzr merge lp://staging/~cjohnston/qa-dashboard/dashboard-sru-2-sru
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Joe Talbott	2013-01-04	Approve on 2013-01-04
Chris Johnston		Pending
Review via email: mp+141944@code.staging.launchpad.net

This proposal supersedes a proposal from 2013-01-04.

Commit message

Moves sru code from dashboard to new sru app

Revision history for this message

Joe Talbott (joetalbott) wrote on 2013-01-04: Posted in a previous version of this proposal

#

I'd prefer to change have jenkins_get() and friends in common/management/__init__.py rather than common/helpers.py since that code is only used in management commands.

The sru/migrations/0001_initial.py logic needs to test if the table name exists and add it if it doesn't. This means we can't return after each check because none of the other checks will happen. I propose something like this:

table_names = connection.introspection.table_names()

if 'kernels' not in table_names:
db.create_table('kernels'...

if 'sru_results' not in talbe_names:
db.create_table('sru_results'...

review: Needs Fixing

Revision history for this message

Chris Johnston (cjohnston) on 2013-01-04: Posted in a previous version of this proposal

#

review: Needs Resubmitting

Revision history for this message

Joe Talbott (joetalbott) wrote on 2013-01-04:

#

Remove lines 24-93 please.

Line 365 needs inserted 'from django.db import connection'

review: Needs Fixing

Revision history for this message

Joe Talbott (joetalbott) wrote on 2013-01-04:

#

Looks good, thanks.

review: Approve

Revision history for this message

Chris Johnston (cjohnston) wrote on 2013-01-04:

#

Download full text (3.9 KiB)

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

Creating test database for alias 'default'...

Traceback (most recent call last):
  File "manage.py", line 26, in <module>
    execute_from_command_line(sys.argv)
  File "/usr/lib/python2.7/dist-packages/django/core/management/__init__.py", line 429, in execute_from_command_line
    utility.execute()
  File "/usr/lib/python2.7/dist-packages/django/core/management/__init__.py", line 379, in execute
    self.fetch_command(subcommand).run_from_argv(self.argv)
  File "/usr/lib/python2.7/dist-packages/django/core/management/base.py", line 191, in run_from_argv
    self.execute(*args, **options.__dict__)
  File "/usr/lib/python2.7/dist-packages/django/core/management/base.py", line 220, in execute
    output = self.handle(*args, **options)
  File "/usr/lib/python2.7/dist-packages/south/management/commands/test.py", line 8, in handle
    super(Command, self).handle(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/django/core/management/commands/test.py", line 37, in handle
    failures = test_runner.run_tests(test_labels)
  File "/usr/lib/python2.7/dist-packages/django/test/simple.py", line 359, in run_tests
    old_config = self.setup_databases()
  File "/usr/lib/python2.7/dist-packages/django/test/simple.py", line 296, in setup_databases
    test_db_name = connection.creation.create_test_db(self.verbosity, autoclobber=not self.interactive)
  File "/usr/lib/python2.7/dist-packages/django/db/backends/creation.py", line 366, in create_test_db
    load_initial_data=False)
  File "/usr/lib/python2.7/dist-packages/django/core/management/__init__.py", line 166, in call_command
    return klass.execute(*args, **defaults)
  File "/usr/lib/python2.7/dist-packages/django/core/management/base.py", line 220, in execute
    output = self.handle(*args, **options)
  File "/usr/lib/python2.7/dist-packages/django/core/management/base.py", line 351, in handle
    return self.handle_noargs(**options)
  File "/usr/lib/python2.7/dist-packages/south/management/commands/syncdb.py", line 99, in handle_noargs
    management.call_command('migrate', **options)
  File "/usr/lib/python2.7/dist-packages/django/core/management/__init__.py", line 166, in call_command
    return klass.execute(*args, **defaults)
  File "/usr/lib/python2.7/dist-packages/django/core/management/base.py", line 220, in execute
    output = self.handle(*args, **options)
  File "/usr/lib/python2.7/dist-packages/south/management/commands/migrate.py", line 105, in handle
    ignore_ghosts = ignore_ghosts,
  File "/usr/lib/python2.7/dist-packages/south/migration/__init__.py", line 191, in migrate_app
    success = migrator.migrate_many(target, workplan, database)
  File "/usr/lib/python2.7/dist-packages/south/migration/migrators.py", line 221, in migrate_many
    result = migrator.__class__.migrate_many(migrator, target, migrations, database)
  File "/usr/lib/python2.7/dist-packages/south/migration/migrators.py", line 292, in migrate_many
    result = self.migrate(migration, database)
  File "/usr/lib/python2.7/dist-packages/south/migration/migrators.py", l...

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

Creating test database for alias 'default'...

Traceback (most recent call last):
  File "manage.py", line 26, in <module>
    execute_from_command_line(sys.argv)
  File "/usr/lib/python2.7/dist-packages/django/core/management/__init__.py", line 429, in execute_from_command_line
    utility.execute()
  File "/usr/lib/python2.7/dist-packages/django/core/management/__init__.py", line 379, in execute
    self.fetch_command(subcommand).run_from_argv(self.argv)
  File "/usr/lib/python2.7/dist-packages/django/core/management/base.py", line 191, in run_from_argv
    self.execute(*args, **options.__dict__)
  File "/usr/lib/python2.7/dist-packages/django/core/management/base.py", line 220, in execute
    output = self.handle(*args, **options)
  File "/usr/lib/python2.7/dist-packages/south/management/commands/test.py", line 8, in handle
    super(Command, self).handle(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/django/core/management/commands/test.py", line 37, in handle
    failures = test_runner.run_tests(test_labels)
  File "/usr/lib/python2.7/dist-packages/django/test/simple.py", line 359, in run_tests
    old_config = self.setup_databases()
  File "/usr/lib/python2.7/dist-packages/django/test/simple.py", line 296, in setup_databases
    test_db_name = connection.creation.create_test_db(self.verbosity, autoclobber=not self.interactive)
  File "/usr/lib/python2.7/dist-packages/django/db/backends/creation.py", line 366, in create_test_db
    load_initial_data=False)
  File "/usr/lib/python2.7/dist-packages/django/core/management/__init__.py", line 166, in call_command
    return klass.execute(*args, **defaults)
  File "/usr/lib/python2.7/dist-packages/django/core/management/base.py", line 220, in execute
    output = self.handle(*args, **options)
  File "/usr/lib/python2.7/dist-packages/django/core/management/base.py", line 351, in handle
    return self.handle_noargs(**options)
  File "/usr/lib/python2.7/dist-packages/south/management/commands/syncdb.py", line 99, in handle_noargs
    management.call_command('migrate', **options)
  File "/usr/lib/python2.7/dist-packages/django/core/management/__init__.py", line 166, in call_command
    return klass.execute(*args, **defaults)
  File "/usr/lib/python2.7/dist-packages/django/core/management/base.py", line 220, in execute
    output = self.handle(*args, **options)
  File "/usr/lib/python2.7/dist-packages/south/management/commands/migrate.py", line 105, in handle
    ignore_ghosts = ignore_ghosts,
  File "/usr/lib/python2.7/dist-packages/south/migration/__init__.py", line 191, in migrate_app
    success = migrator.migrate_many(target, workplan, database)
  File "/usr/lib/python2.7/dist-packages/south/migration/migrators.py", line 221, in migrate_many
    result = migrator.__class__.migrate_many(migrator, target, migrations, database)
  File "/usr/lib/python2.7/dist-packages/south/migration/migrators.py", line 292, in migrate_many
    result = self.migrate(migration, database)
  File "/usr/lib/python2.7/dist-packages/south/migration/migrators.py", line 125, in migrate
    result = self.run(migration)
  File "/usr/lib/python2.7/dist-packages/south/migration/migrators.py", line 99, in run
    return self.run_migration(migration)
  File "/usr/lib/python2.7/dist-packages/south/migration/migrators.py", line 82, in run_migration
    south.db.db.execute_deferred_sql()
  File "/usr/lib/python2.7/dist-packages/south/db/generic.py", line 184, in execute_deferred_sql
    self.execute(sql)
  File "/usr/lib/python2.7/dist-packages/south/db/generic.py", line 150, in execute
    cursor.execute(sql, params)
  File "/usr/lib/python2.7/dist-packages/django/db/backends/postgresql_psycopg2/base.py", line 44, in execute
    return self.cursor.execute(query, args)
django.db.utils.DatabaseError: relation "bugs" does not exist

Unmerged revisions

205. By Chris Johnston on 2013-01-04: requested changes
204. By Chris Johnston on 2013-01-04: Fixes indentation
203. By Chris Johnston on 2013-01-04: Fixes indentation
202. By Chris Johnston on 2013-01-04: Updates SRU

Ubuntu CI Dashboard

Merge lp://staging/~cjohnston/qa-dashboard/dashboard-sru-2-sru into lp://staging/qa-dashboard

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers