testcase : fix remove project and lock test case

[Description]

Change-Id: I7751aead692e5165d8b9eaf2ea765226d7f499af
Signed-off-by: Hyoun Jiil <jiil.hyoun@samsung.com>

diff --git a/src/build_server/BinaryUploadProject.rb b/src/build_server/BinaryUploadProject.rb
index b65b8cb1d2283f9bc34c320a3c9f69c015f46660..2c35d8e867013b9558a361144db8358ef2ae5647 100644 (file)
--- 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 6a8df2c77a4368168624aff69b7abd909ff52984..a8cb9cbe71e47ccd288b7e3af2727acf6023513e 100644 (file)
--- 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 5520a8e7f5352e4b723bdf3bcbb53ec00ca127bb..a5520cf688f87f74ee97cfa3fc46b3d5357fb151 100644 (file)
--- 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 8a3a9c3122ccd9f147b7f0d1560bcdeef31b4a9a..7c4a92edfe9df45898c76ba6a986f70597a5aa02 100644 (file)
--- 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!