Skip to content

Commit 7a5077b

Browse files
hrideshmgcanihavesomecoffee
authored andcommitted
fix: errors on first-time setup
1 parent 19052be commit 7a5077b

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

install/sample_db.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,15 @@
1111
def run():
1212
from database import create_session
1313
from mod_auth.models import User
14+
from mod_customized.models import CustomizedTest
1415
from mod_home.models import CCExtractorVersion, GeneralData
1516
from mod_regression.models import (Category, InputType, OutputType,
1617
RegressionTest, RegressionTestOutput)
1718
from mod_sample.models import Sample
19+
from mod_test.models import Test
1820
from mod_upload.models import Upload
1921

22+
2023
db = create_session(sys.argv[1])
2124

2225
entries = []

mod_ci/controllers.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1348,8 +1348,8 @@ def progress_type_request(log, test, test_id, request) -> bool:
13481348

13491349
for p in times:
13501350
parts = p.time.split(',')
1351-
start = datetime.datetime.strptime(parts[0], '%Y-%m-%d %H:%M:%S.%f')
1352-
end = datetime.datetime.strptime(parts[-1], '%Y-%m-%d %H:%M:%S.%f')
1351+
start = datetime.datetime.strptime(parts[0], '%Y-%m-%d %H:%M:%S')
1352+
end = datetime.datetime.strptime(parts[-1], '%Y-%m-%d %H:%M:%S')
13531353
total_time += int((end - start).total_seconds())
13541354

13551355
if len(times) != 0:
@@ -1377,7 +1377,7 @@ def progress_type_request(log, test, test_id, request) -> bool:
13771377

13781378
last_running_test = end_time - start_time
13791379
updated_average = updated_average + last_running_test.total_seconds()
1380-
current_average.value = updated_average // number_test
1380+
current_average.value = 0 if number_test == 0 else updated_average // number_test
13811381
g.db.commit()
13821382
log.info(f'average time updated to {str(current_average.value)}')
13831383

mod_test/controllers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ def get_data_for_test(test, title=None) -> Dict[str, Any]:
150150
prep_average_key = 'avg_prep_time_' + test.platform.value
151151
average_prep_time = int(float(GeneralData.query.filter(GeneralData.key == prep_average_key).first().value))
152152

153-
test_progress_last_entry = g.db.query(func.max(TestProgress.test_id)).first()
153+
test_progress_last_entry = g.db.query(func.max(TestProgress.test_id)).first() or 0
154154
queued_gcp_instance = g.db.query(GcpInstance.test_id).filter(GcpInstance.test_id < test.id).subquery()
155155
queued_gcp_instance_entries = g.db.query(Test.id).filter(
156156
and_(Test.id.in_(queued_gcp_instance), Test.platform == test.platform)

0 commit comments

Comments
 (0)