From ebffc56e8a4873266d3ddeecc8d19aea18686ca5 Mon Sep 17 00:00:00 2001 From: Jeffrey Thiessen Date: Mon, 9 Dec 2024 16:41:24 -0600 Subject: [PATCH] Delay injecting db entries to allow the mysql db to be created, + fix updated table --- iridauploader/tests_integration/create_sequencer_client.sql | 2 +- iridauploader/tests_integration/integration_data_setup.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/iridauploader/tests_integration/create_sequencer_client.sql b/iridauploader/tests_integration/create_sequencer_client.sql index e722a96..686bf3d 100644 --- a/iridauploader/tests_integration/create_sequencer_client.sql +++ b/iridauploader/tests_integration/create_sequencer_client.sql @@ -4,4 +4,4 @@ INSERT INTO client_details_grant_types (client_details_id,grant_value) VALUES (1 INSERT INTO client_details_scope (client_details_id,scope) VALUES (1,"read"); INSERT INTO client_details_scope (client_details_id,scope) VALUES (1,"write"); -- user -- password encryption of `password1` -INSERT INTO user (`createdDate`, `modifiedDate`, `email`, `firstName`, `lastName`, `locale`, `password`, `phoneNumber`, `username`, `enabled`, `system_role`, `credentialsNonExpired`) VALUES (now(), now() , 'jeffrey.thiessen@phac-aspc.gc.ca', 'Jeffrey', 'Thiessen', 'en', '$2a$10$yvzFLxWA9m2wNQmHpJtWT.MRZv8qV8Mo3EMB6HTkDnUbi9aBrbWWW', '0000', 'jeff', 1, 'ROLE_ADMIN', 1); +INSERT INTO user (`createdDate`, `modifiedDate`, `email`, `firstName`, `lastName`, `locale`, `password`, `phoneNumber`, `username`, `enabled`, `system_role`, `credentialsNonExpired`, `user_type`) VALUES (now(), now() , 'jeffrey.thiessen@phac-aspc.gc.ca', 'Jeffrey', 'Thiessen', 'en', '$2a$10$yvzFLxWA9m2wNQmHpJtWT.MRZv8qV8Mo3EMB6HTkDnUbi9aBrbWWW', '0000', 'jeff', 1, 'ROLE_ADMIN', 1, 'TYPE_LOCAL'); diff --git a/iridauploader/tests_integration/integration_data_setup.py b/iridauploader/tests_integration/integration_data_setup.py index f29af11..7bc90b3 100644 --- a/iridauploader/tests_integration/integration_data_setup.py +++ b/iridauploader/tests_integration/integration_data_setup.py @@ -112,6 +112,8 @@ def update_irida_db(self): Adds a user and a client for api operations to IRIDA database :return: """ + sleep(120) + db_update_proc = subprocess.Popen(self.IRIDA_DB_UPDATE, shell=True) proc_res = db_update_proc.wait()