Merge lp:~canonical-isd-hackers/canonical-identity-provider/sqlcachedflush-consistency into lp:canonical-identity-provider/release

[Ricardo Kirkner]

[Łukasz Czyżykowski (lukasz-czyzykowski)]

Nothing to fix

review: Approve

=== modified file 'identityprovider/management/commands/sqlcachedflush.py'
--- identityprovider/management/commands/sqlcachedflush.py	2010-04-21 15:29:24 +0000
+++ identityprovider/management/commands/sqlcachedflush.py	2010-05-11 17:01:29 +0000
@@ -1,20 +1,46 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
+from django.core.management.base import CommandError
+from django.core.management.color import no_style
 from django.core.management.commands.flush import Command as FlushCommand
-from django.core.management.color import no_style
 
 
 class Command(FlushCommand):
     cached_flush = None
 
     def handle_noargs(self, **options):
-        from django.db import connection
-        from django.core.management.sql import sql_flush
+        from django.conf import settings
+        from django.core.management.sql import sql_flush, emit_post_sync_signal
+        from django.db import connection, transaction, models
+
+        verbosity = int(options.get('verbosity', 1))
+        interactive = options.get('interactive')
+
         self.style = no_style()
+
         if self.cached_flush is not None:
-            cursor = connection.cursor()
-            cursor.execute(self.cached_flush)
+            try:
+                cursor = connection.cursor()
+                cursor.execute(self.cached_flush)
+            except Exception, e:
+                transaction.rollback_unless_managed()
+                raise CommandError("""Database %s couldn't be flushed. Possible reasons:
+      * The database isn't running or isn't configured correctly.
+      * At least one of the expected database tables doesn't exist.
+      * The SQL was invalid.
+    Hint: Look at the output of 'django-admin.py sqlflush'. That's the SQL this command wasn't able to run.
+    The full error: %s""" % (settings.DATABASE_NAME, e))
+            transaction.commit_unless_managed()
+
+            # Emit the post sync signal. This allows individual
+            # applications to respond as if the database had been
+            # sync'd from scratch.
+            emit_post_sync_signal(models.get_models(), verbosity, interactive)
+
+            # Reinstall the initial_data fixture.
+            from django.core.management import call_command
+            call_command('loaddata', 'initial_data', **options)
         else:
             super(Command, self).handle_noargs(**options)
             # Call sql_flush instead of picking up the raw queries because

=== added file 'identityprovider/tests/test_command_sqlcachedflush.py'
--- identityprovider/tests/test_command_sqlcachedflush.py	1970-01-01 00:00:00 +0000
+++ identityprovider/tests/test_command_sqlcachedflush.py	2010-05-11 17:01:29 +0000
@@ -0,0 +1,57 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+import signal
+from subprocess import Popen, PIPE
+
+from django.conf import settings
+from django.core.management import call_command
+
+from identityprovider.tests.utils import SQLCachedTestCase
+
+
+class Alarm(Exception):
+    pass
+
+
+def alarm_handler(signum, frame):
+    raise Alarm
+
+
+class SQLCachedFlushCommandTestCase(SQLCachedTestCase):
+    def setUp(self):
+        # set alarm handler
+        self.old_signal = signal.signal(signal.SIGALRM, alarm_handler)
+
+    def tearDown(self):
+        # reset alarm handler
+        signal.signal(signal.SIGALRM, self.old_signal)
+
+    def test_sqlcachedflush_command(self):
+        args = ['pg_dump']
+        if settings.DATABASE_USER:
+            args.extend(['-U', settings.DATABASE_USER])
+        if settings.DATABASE_PASSWORD:
+            _PGPASS = os.environ['PGPASSWORD']
+            os.environ['PGPASSWORD'] = settings.DATABASE_PASSWORD
+        if settings.DATABASE_HOST:
+            args.extend(['-h', settings.DATABASE_HOST])
+        if settings.DATABASE_PORT:
+            args.extend(['-p', settings.DATABASE_PORT])
+        args.append(settings.DATABASE_NAME)
+
+        call_command('flush', interactive=False)
+        flush_sql = Popen(args, stdout=PIPE).communicate()[0]
+
+        call_command('sqlcachedflush', interactive=False)
+        # timeout after 5 seconds
+        signal.alarm(5)
+        try:
+            sqlcachedflush_sql = Popen(args, stdout=PIPE).communicate()[0]
+            # reset the alarm
+            signal.alarm(0)
+        except Alarm:
+            self.fail()
+
+        self.assertEqual(sqlcachedflush_sql, flush_sql)
+