[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 b03213f25e33b83585368f3c83c0715398ee3638..f04d988bd41f370ad5ff5a4e5b299f1f6c1c7910 100644 (file)
--- 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 7e46f1002bb68fd43822f96516f5ceaf1ee1423f..3b533ead640974212b2ec0d66c00b52d06521873 100644 (file)
--- 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 e4ec43e09bab5db05cf81f3c520ec3f68f5c97e4..71e4125a959e6b46fd0a33fcf5f6d0a177bf4c4f 100644 (file)
--- 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 07ec572f72d15d2887b7aebb17f3cc408a72a65b..13a91dc4b4676fe404401401f82c23fc925663c9 100644 (file)
--- 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