Skip to content

Commit a0969df

Browse files
committed
fix breaking tests
1 parent b593c70 commit a0969df

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

servicex_app/migrations/versions/1.7.0.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ def upgrade():
2020
op.create_index('ix_transform_result_created_at', 'transform_result', ['created_at'])
2121

2222
op.add_column('transform_result', sa.Column('s3_object_name', sa.String(length=512), nullable=True))
23-
op.create_index('ix_transform_result_s3_object_name', 'transform_result', ['s3_object_name'])
2423

2524
op.create_index('ix_transform_result_request_id', 'transform_result', ['request_id'])
2625

@@ -29,7 +28,6 @@ def downgrade():
2928
op.drop_index('ix_transform_result_created_at', table_name='transform_result')
3029
op.drop_column('transform_result', 'created_at')
3130

32-
op.drop_index('ix_transform_result_s3_object_name', table_name='transform_result')
3331
op.drop_column('transform_result', 's3_object_name')
3432

3533
op.drop_index('ix_transform_result_request_id', table_name='transform_result')

servicex_app/servicex_app/resources/internal/transformer_file_complete.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,7 @@ def record_file_complete(session: Session, logger: Logger, request_id: str,
168168
@staticmethod
169169
@file_complete_ops_retry
170170
def save_transform_result(request_id: str, info: dict[str, str], session: Session):
171-
import json
172171
with session.begin():
173-
logger = logging.getLogger(__name__)
174-
logger.error('info:')
175-
logger.error(json.dumps(info))
176-
assert False, json.dumps(info)
177172
rec = TransformationResult(
178173
file_id=info['file-id'],
179174
request_id=request_id,
@@ -183,7 +178,7 @@ def save_transform_result(request_id: str, info: dict[str, str], session: Sessio
183178
total_bytes=info['total-bytes'],
184179
total_events=info['total-events'],
185180
avg_rate=info['avg-rate'],
186-
s3_object_name=json.dumps(info),
181+
s3_object_name=info['s3-object-name'],
187182
)
188183
session.add(rec)
189184

servicex_app/servicex_app_test/resources/internal/test_transform_file_complete.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ def file_complete_response(self):
7878
'total-time': 100,
7979
'total-events': 10000,
8080
'total-bytes': 325683,
81-
'avg-rate': 30.2
81+
'avg-rate': 30.2,
82+
's3-object-name': 'file://s3-object-name',
8283
}
8384

8485
def test_put_transform_file_complete_files_remaining(self,

0 commit comments

Comments
 (0)