From a6d0166a95d221db5e2c52ea9d5cf6eec645b7af Mon Sep 17 00:00:00 2001 From: Hyoun Jiil Date: Thu, 23 Jan 2014 11:34:00 +0900 Subject: [PATCH] testcase : fix remove project and lock test case [Description] Change-Id: I7751aead692e5165d8b9eaf2ea765226d7f499af Signed-off-by: Hyoun Jiil --- src/build_server/BinaryUploadProject.rb | 2 +- src/build_server/CommonProject.rb | 1 + src/build_server/GitBuildProject.rb | 2 +- test/build-server.multi_dist1/build-svr2-09.testcase | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/build_server/BinaryUploadProject.rb b/src/build_server/BinaryUploadProject.rb index b65b8cb..2c35d8e 100644 --- a/src/build_server/BinaryUploadProject.rb +++ b/src/build_server/BinaryUploadProject.rb @@ -192,9 +192,9 @@ class BinaryUploadProject < CommonProject def unload(db) - unload_common(db) if @prj_id != -1 then db.do "DELETE FROM project_bins WHERE project_id=#{@prj_id}" end + unload_common(db) end end diff --git a/src/build_server/CommonProject.rb b/src/build_server/CommonProject.rb index 6a8df2c..a8cb9cb 100644 --- a/src/build_server/CommonProject.rb +++ b/src/build_server/CommonProject.rb @@ -345,6 +345,7 @@ class CommonProject row = db.select_one("SELECT * FROM projects WHERE id=#{@prj_id}") if row.nil? then return -1 end db.do "DELETE FROM project_os WHERE project_id=#{@prj_id}" + db.do "DELETE FROM group_project_accesses WHERE project_id=#{@prj_id}" db.select_all("SELECT * FROM sources WHERE project_id=#{@prj_id}") do |r| source_id = r['id'] db.do "DELETE FROM packages WHERE source_id=#{source_id}" diff --git a/src/build_server/GitBuildProject.rb b/src/build_server/GitBuildProject.rb index 5520a8e..a5520cf 100644 --- a/src/build_server/GitBuildProject.rb +++ b/src/build_server/GitBuildProject.rb @@ -145,10 +145,10 @@ class GitBuildProject < CommonProject def unload(db) - unload_common(db) if @prj_id != -1 then db.do "DELETE FROM project_gits WHERE project_id=#{@prj_id}" end + unload_common(db) end def get_latest_source_info(db) diff --git a/test/build-server.multi_dist1/build-svr2-09.testcase b/test/build-server.multi_dist1/build-svr2-09.testcase index 8a3a9c3..7c4a92e 100644 --- a/test/build-server.multi_dist1/build-svr2-09.testcase +++ b/test/build-server.multi_dist1/build-svr2-09.testcase @@ -7,6 +7,6 @@ #POST-EXEC #EXPECT Distribution is locked! -Distribution is locked! -Distribution is unlocked! +Locking distribution failed! Distribution is unlocked! +Unlocking distribution failed! -- 2.7.4