From d164f1c4cb2c686e0738361c33f57a370d245718 Mon Sep 17 00:00:00 2001 From: Hyoun Jiil Date: Tue, 4 Feb 2014 10:25:45 +0900 Subject: [PATCH] rase errr when no latest commit exist only if use uselatest option [Description] Change-Id: Icf643e9f375159c84e21a8f4320c51ab0dc605b4 Signed-off-by: Hyoun Jiil --- src/build_server/BuildServerException.rb | 1 + src/build_server/SocketJobRequestListener.rb | 24 +++++++++++++----- .../build-server.basic1/build-cli-43.testcase | 1 - .../build-server.basic1/build-cli-44.testcase | 9 +++++++ test/build-server.basic1/testsuite | 1 + test/git01/newbinary.tar.gz | Bin 0 -> 7994 bytes 6 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 test/build-server.basic1/build-cli-44.testcase create mode 100644 test/git01/newbinary.tar.gz 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 0000000000000000000000000000000000000000..9102737d5f1a13bcfc707271462d4b2621b28c49 GIT binary patch literal 7994 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