probable fix

Author: feyruzb

web/server/codechecker_server/api/product_server.py

@@ -395,6 +395,7 @@ def addProduct(self, product):
                 codechecker_api_shared.ttypes.ErrorCode.GENERAL,
                 msg)
 
+        # Check if the database is already in use by another product.
         db_in_use = self.__server.get_if_database_in_use(product.connection)
         if db_in_use:
             LOG.error("Database '%s' is already in use by another product!",
@@ -403,6 +404,7 @@ def addProduct(self, product):
                 codechecker_api_shared.ttypes.ErrorCode.DATABASE,
                 "Database is already in use by another product!")
 
+        # Add database before letting product connect to it
         if self.add_product_support(product):
             LOG.info("Database support added successfully.")
 

web/server/codechecker_server/server.py

@@ -939,6 +939,8 @@ def get_if_database_in_use(self, product):
         self.cfg_sess_private.commit()
         self.cfg_sess_private.close()
 
+        # remove the first 16 charecters because in query it is
+        # included in the path string
         dynamic_list = [
             d[16:] if d.endswith('.sqlite') else d
             for d in dynamic_list

web/tests/functional/products/test_config_db_share.py

@@ -160,7 +160,7 @@ def create_test_product(product_name, product_endpoint):
                     username_b64='',
                     password_b64='',
                     database=os.path.join(self.test_workspace_secondary,
-                                          'data_test.sqlite')))
+                                          'data.sqlite')))
 
         product_cfg = create_test_product('producttest_second',
                                           'producttest_second')
@@ -178,9 +178,6 @@ def create_test_product(product_name, product_endpoint):
         with self.assertRaises(RequestFailed):
             self._pr_client_2.addProduct(product_cfg)
 
-        # self.assertTrue(self._pr_client_2.addProduct(product_cfg),
-        #                 "Cannot create product on secondary server.")
-
         # Product name full string match.
         products = self._pr_client_2.getProducts('producttest_second', None)
         self.assertEqual(len(products), 1)

web/tests/functional/store/test_store.py

@@ -72,10 +72,12 @@ def setup_class(self):
 
         server_access['viewer_product'] = 'store_limited_product'
         codechecker.add_test_package_product(server_access, TEST_WORKSPACE,
-                                             report_limit=2)
+                                             report_limit=2,
+                                             database_name='store_limited')
 
         server_access['viewer_product'] = 'store_test'
-        codechecker.add_test_package_product(server_access, TEST_WORKSPACE)
+        codechecker.add_test_package_product(server_access, TEST_WORKSPACE,
+                                             database_name='store_test')
 
         # Extend the checker configuration with the server access.
         codechecker_cfg.update(server_access)

web/tests/libtest/codechecker.py

@@ -733,7 +733,8 @@ def start_server_proc(event, server_cmd, checking_env):
 
 def add_test_package_product(server_data, test_folder, check_env=None,
                              protocol='http', report_limit=None,
-                             user_permissions=None):
+                             user_permissions=None,
+                             database_name="data.sqlite"):
     """
     Add a product for a test suite to the server provided by server_data.
     Server must be running before called.
@@ -781,7 +782,7 @@ def add_test_package_product(server_data, test_folder, check_env=None,
     else:
         # SQLite databases are put under the workspace of the appropriate test.
         add_command += ['--sqlite',
-                        os.path.join(test_folder, 'data.sqlite')]
+                        os.path.join(test_folder, database_name)]
 
     print(' '.join(add_command))