From: jiil.hyoun <jiil.hyoun@samsung.com>
Date: Mon, 3 Dec 2012 12:51:21 +0000 (+0900)
Subject: [Title] regression test bug fixes
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=137ca74896d49c1e900fcc65d7bbb9b636472dae;p=sdk%2Ftools%2Fsdk-build.git

[Title] regression test bug fixes
[Type] Bugfix
[Module] Toolchain /
[Priority] Major
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

Change-Id: If4dc2d5f84fe064c8293fff03eb6c6271d85c162
---

diff --git a/src/build_server/JobManager.rb b/src/build_server/JobManager.rb
index b03213f..f04d988 100644
--- a/src/build_server/JobManager.rb
+++ b/src/build_server/JobManager.rb
@@ -117,10 +117,10 @@ class JobManager
 		return RegisterPackageJob.new( file_path, nil, @server, nil, dist_name )
 	end
 
-	def set_remote(job)
+	def set_remote(job, rserver)
 		job.set_remote_job(rserver)
 		@server.get_db_connection() do |db|
-			db.do "UPDATE jobs SET remote_build_server_id = '#{server.id}' WHERE id = '#{job.id}'"
+			db.do "UPDATE jobs SET remote_build_server_id = '#{rserver.id}' WHERE id = '#{job.id}'"
 		end
 	end
 
@@ -199,7 +199,7 @@ class JobManager
 	def execute_remote(job, rserver)
 
 		# start build
-		set_remote(job)
+		set_remote(job, rserver)
 		if job.execute() then
 			# status change & job control
 			job.status = "REMOTE_WORKING"
diff --git a/src/build_server/RegisterPackageJob.rb b/src/build_server/RegisterPackageJob.rb
index 7e46f10..3b533ea 100644
--- a/src/build_server/RegisterPackageJob.rb
+++ b/src/build_server/RegisterPackageJob.rb
@@ -221,10 +221,11 @@ class RegisterPackageJob < CommonJob
 			@log.info( "Job is FINISHED successfully!" , Log::LV_USER)
 
 			# if succeeded, register source info and copy pkginfo.manifest
-			@log.info( "Updating the source info for project \"#{@project.name}\"" , Log::LV_USER)
-			@project.save_source_info( @pkginfo.get_version(), '')
-			@project.save_package_info_from_manifest( @pkginfo.get_version(),
-				"#{@source_path}/pkginfo.manifest", @os)
+			if not @project.nil? then
+				@log.info( "Updating the source info for project \"#{@project.name}\"" , Log::LV_USER)
+				@project.save_source_info( @pkginfo.get_version(), '')
+				@project.save_package_info_from_manifest( @pkginfo.get_version(),"#{@source_path}/pkginfo.manifest", @os)
+			end
 
 			# clean up
 			@server.cleaner.clean(@id)
diff --git a/src/build_server/RemoteBuildServer.rb b/src/build_server/RemoteBuildServer.rb
index e4ec43e..71e4125 100644
--- a/src/build_server/RemoteBuildServer.rb
+++ b/src/build_server/RemoteBuildServer.rb
@@ -124,7 +124,7 @@ class RemoteBuildServer
 		else
 			db.do "UPDATE remote_build_servers SET
 				status = '#{@status}',
-				supported_os_id = (SELECT supported_os.id FROM supported_os_id WHERE supported_os.name = '#{@host_os}'),
+				supported_os_id = (SELECT supported_os.id FROM supported_os WHERE supported_os.name = '#{@host_os}'),
 				max_job_count = #{@max_working_jobs},
 				working_job_count = #{@working_jobs.count},
 				waiting_job_count = #{@waiting_jobs.count} WHERE id = #{@id}"
diff --git a/test/build-server.multi-svr2/01.testcase b/test/build-server.multi-svr2/01.testcase
index 07ec572..13a91dc 100644
--- a/test/build-server.multi-svr2/01.testcase
+++ b/test/build-server.multi-svr2/01.testcase
@@ -1,7 +1,7 @@
 #PRE-EXEC
 #EXEC
 ../../pkg-svr register -n pkgsvr02 -d unstable -P bin/bin_0.0.1_ubuntu-32.zip
-sleep 25
+sleep 50
 ../../pkg-cli list-rpkg -P bin -u `pwd`/pkgsvr01/unstable
 #POST-EXEC
 #EXPECT