From: Hyoun Jiil Date: Tue, 4 Feb 2014 01:25:45 +0000 (+0900) Subject: rase errr when no latest commit exist only if use uselatest option X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d164f1c4cb2c686e0738361c33f57a370d245718;p=sdk%2Ftools%2Fsdk-build.git rase errr when no latest commit exist only if use uselatest option [Description] Change-Id: Icf643e9f375159c84e21a8f4320c51ab0dc605b4 Signed-off-by: Hyoun Jiil --- diff --git a/src/build_server/BuildServerException.rb b/src/build_server/BuildServerException.rb index 762c2cb..05191a5 100644 --- a/src/build_server/BuildServerException.rb +++ b/src/build_server/BuildServerException.rb @@ -28,6 +28,7 @@ class BuildServerException < Exception "ERR022" => "There already exists same job.", "ERR023" => "Cannot create package client!", "ERR024" => "Attribute not supports!", + "ERR025" => "no latest commit exists", "ERR100" => "Package info file(\"package/pkginfo.manifest\") does not exist!", "ERR101" => "Parsing package info file failed!", diff --git a/src/build_server/SocketJobRequestListener.rb b/src/build_server/SocketJobRequestListener.rb index 2241835..1a3f18b 100644 --- a/src/build_server/SocketJobRequestListener.rb +++ b/src/build_server/SocketJobRequestListener.rb @@ -272,7 +272,12 @@ class SocketJobRequestListener else new_job.user_id = user_id if uselatest then - new_job.git_commit = get_latest_commit(pname, dist_name) + commitId = get_latest_commit(pname, dist_name) + if commitId.nil? then + raise BuildServerException.new("ERR025"), pname + else + new_job.git_commit = commitId + end end end new_job_list.push new_job @@ -320,14 +325,19 @@ class SocketJobRequestListener if new_job.nil? then raise BuildServerException.new("ERR006"), "\"#{pname}\" does not support #{os} in #{dist_name}" else - new_job.user_id = user_id + new_job.user_id = user_id if uselatest then - new_job.git_commit = get_latest_commit(pname, dist_name) + commitId = get_latest_commit(pname, dist_name) + if commitId.nil? then + raise BuildServerException.new("ERR025"), pname + else + new_job.git_commit = commitId + end end - end - else - raise BuildServerException.new("ERR006"), "Cannot find your project to build!" - end + end + else + raise BuildServerException.new("ERR006"), "Cannot find your project to build!" + end # check reverse build if no_reverse then new_job.set_no_reverse end diff --git a/test/build-server.basic1/build-cli-43.testcase b/test/build-server.basic1/build-cli-43.testcase index aa7f458..7e966d1 100644 --- a/test/build-server.basic1/build-cli-43.testcase +++ b/test/build-server.basic1/build-cli-43.testcase @@ -79,4 +79,3 @@ Info: Snapshot: Info: Job is completed! Info: Job is FINISHED successfully! Info: Updating the source info for project "binary" - diff --git a/test/build-server.basic1/build-cli-44.testcase b/test/build-server.basic1/build-cli-44.testcase new file mode 100644 index 0000000..378633b --- /dev/null +++ b/test/build-server.basic1/build-cli-44.testcase @@ -0,0 +1,9 @@ +#PRE-EXEC +echo "register noreverse " +cd git01;tar xf newbinary.tar.gz +../../build-svr add-prj -n testserver3 -N newbinary -g `pwd`/git01/newbinary -b master +#EXEC +../../build-cli build -N newbinary -d 127.0.0.1:2223 -U admin@user -w 1234 --uselatest +#POST-EXEC +#EXPECT +Error: Error: no latest commit exists: newbinary diff --git a/test/build-server.basic1/testsuite b/test/build-server.basic1/testsuite index dc73902..562420d 100644 --- a/test/build-server.basic1/testsuite +++ b/test/build-server.basic1/testsuite @@ -41,3 +41,4 @@ build-cli-40.testcase build-cli-41.testcase build-cli-42.testcase build-cli-43.testcase +build-cli-44.testcase diff --git a/test/git01/newbinary.tar.gz b/test/git01/newbinary.tar.gz new file mode 100644 index 0000000..9102737 Binary files /dev/null and b/test/git01/newbinary.tar.gz differ