Delay injecting db entries to allow the mysql db to be created, + fix…

… updated table
phac-nml · Dec 9, 2024 · ebffc56 · ebffc56
1 parent b42bfc1
commit ebffc56
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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()