From d20621378e937f9f25ec1ca8bc317579c7d48bbc Mon Sep 17 00:00:00 2001 From: Craig Rodrigues Date: Thu, 19 Jan 2017 19:15:00 -0800 Subject: [PATCH] Fix whitespace to appease 'make isort'. --- .../versions/048_change_properties_to_text.py | 7 +++++-- ...ate_versions_048_change_properties_to_text.py | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/master/buildbot/db/migrate/versions/048_change_properties_to_text.py b/master/buildbot/db/migrate/versions/048_change_properties_to_text.py index a9763a469f4..028762d9992 100644 --- a/master/buildbot/db/migrate/versions/048_change_properties_to_text.py +++ b/master/buildbot/db/migrate/versions/048_change_properties_to_text.py @@ -15,6 +15,7 @@ from __future__ import absolute_import from __future__ import print_function + import sqlalchemy as sa from migrate import changeset @@ -24,8 +25,10 @@ def upgrade(migrate_engine): metadata.bind = migrate_engine if migrate_engine.dialect.name == "postgresql": - # changeset.alter_column has no effect on postgres, so we do this with raw sql - migrate_engine.execute("alter table change_properties alter column property_value type text") + # changeset.alter_column has no effect on postgres, so we do this with + # raw sql + migrate_engine.execute( + "alter table change_properties alter column property_value type text") else: # Commit messages can get too big for the normal 1024 String limit. diff --git a/master/buildbot/test/unit/test_db_migrate_versions_048_change_properties_to_text.py b/master/buildbot/test/unit/test_db_migrate_versions_048_change_properties_to_text.py index 77452b53266..772f06aa4e8 100644 --- a/master/buildbot/test/unit/test_db_migrate_versions_048_change_properties_to_text.py +++ b/master/buildbot/test/unit/test_db_migrate_versions_048_change_properties_to_text.py @@ -15,10 +15,14 @@ from __future__ import absolute_import from __future__ import print_function + from random import choice from string import ascii_lowercase + import sqlalchemy as sa + from twisted.trial import unittest + from buildbot.test.util import migration from buildbot.util import sautils @@ -52,11 +56,14 @@ def verify_thd(conn): metadata = sa.MetaData() metadata.bind = conn random_length = 65535 - random_string = ''.join(choice(ascii_lowercase) for byte in range(random_length)) + random_string = ''.join(choice(ascii_lowercase) + for byte in range(random_length)) # Verify column type is text - change_properties = sautils.Table('change_properties', metadata, autoload=True) - self.assertIsInstance(change_properties.c.property_value.type, sa.Text) + change_properties = sautils.Table( + 'change_properties', metadata, autoload=True) + self.assertIsInstance( + change_properties.c.property_value.type, sa.Text) # Test write and read random string conn.execute(change_properties.insert(), [dict( @@ -66,6 +73,7 @@ def verify_thd(conn): )]) q = conn.execute(sa.select( [change_properties.c.property_value]).where(change_properties.c.changeid == 1)) - [self.assertEqual(q_string[0].encode("ascii"), random_string) for q_string in q] + [self.assertEqual(q_string[0].encode("ascii"), random_string) + for q_string in q] return self.do_test_migration(47, 48, setup_thd, verify_thd)