From: Hyoun Jiil <jiil.hyoun@samsung.com>
Date: Thu, 4 Jul 2013 08:23:44 +0000 (+0900)
Subject: [Title] fix regression test
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=82eface7b141da7d06965c41644e34b82195af1e;p=sdk%2Ftools%2Fsdk-build.git

[Title] fix regression test
[Type] Bugfix
[Module] Toolchain /
[Priority] Minor
[Jira#]
[Redmine#]  9833
[Problem]
[Cause]
[Solution]
[TestCase]

Change-Id: Icabac9e33c0f2704cbe4bd3673097f491e39a03c
---

diff --git a/src/build_server/RegisterPackageJob.rb b/src/build_server/RegisterPackageJob.rb
index 726b609..77ac1aa 100644
--- a/src/build_server/RegisterPackageJob.rb
+++ b/src/build_server/RegisterPackageJob.rb
@@ -177,12 +177,6 @@ class RegisterPackageJob < CommonJob
 			FileUtils.ln(@local_path, @file_path, :force => true)
 		end
 
-		# set up pkgsvr_client
-		@pkgsvr_client =  Client.create(@pkgsvr_url, @job_working_dir, @log)
-		if @pkgsvr_client.nil? then
-			raise BuildServerException.new("ERR023")
-		end
-
 		# check if the os is supported by build server
 		if @pkg_type == "BINARY" and
 			not @server.supported_os_list.include? @os then
@@ -190,6 +184,12 @@ class RegisterPackageJob < CommonJob
 			raise BuildServerException.new("ERR108"), @os
 		end
 
+		# set up pkgsvr_client
+		@pkgsvr_client =  Client.create(@pkgsvr_url, @job_working_dir, @log)
+		if @pkgsvr_client.nil? then
+			raise BuildServerException.new("ERR023")
+		end
+
 		# checking version if not reverse-build job
 		if @pkg_type == "BINARY" then
 			# extrac pkg file
diff --git a/test/build-server.basic2/build-svr-02.testcase b/test/build-server.basic2/build-svr-02.testcase
index 0f25cb9..20022ad 100644
--- a/test/build-server.basic2/build-svr-02.testcase
+++ b/test/build-server.basic2/build-svr-02.testcase
@@ -37,18 +37,18 @@ build-svr remove -n <server name>
 build-svr migrate -n <server name> [--dsn <db dsn> [--dbuser <db_user> --dbpassword <db_password>] ]
 build-svr start -n <server name> [-p <port>]
 build-svr stop -n <server name>
-build-svr upgrade -n <server name>
+build-svr upgrade -n <server name> [-D <distribution name>] [-u <package server url>]
 build-svr add-svr -n <server name> -d <friend server address>
 build-svr remove-svr -n <server name> -d <friend server address>
 build-svr add-os -n <server name> -o <os>
 build-svr remove-os -n <server name> -o <os>
-build-svr add-dist -n <server name> -D <distribution name> -u <package server url> -d <package server address>
+build-svr add-dist -n <server name> -D <distribution name> -u <package server url> -d <package server address> [-w <password>]
 build-svr remove-dist -n <server name> -D <distribution name>
 build-svr lock-dist -n <server name> -D <distribution name>
 build-svr unlock-dist -n <server name> -D <distribution name>
 build-svr add-sync -n <server name> -u <remote pkg server url> [--dist <distribution>]
 build-svr remove-sync -n <server name> -u <remote pkg server url> [--dist <distribution>]
-build-svr add-prj -n <server name> -N <project name> (-g <git repository> -b <git branch>|-P <package name>) [-w <password>] [-o <os list>] [--dist <distribution>]
+build-svr add-prj -n <server name> -N <project name> (-g <git repository> -b <git branch>|-P <package name>) [-o <os list>] [--dist <distribution>]
 build-svr remove-prj -n <server name> -N <project name> [--dist <distribution>]
 build-svr register -n <server name> -P <package file> [--dist <distribution>]
 build-svr query -n <server name>
diff --git a/test/build-server.basic2/build-svr-23.testcase b/test/build-server.basic2/build-svr-23.testcase
index ce6af1a..87649e9 100644
--- a/test/build-server.basic2/build-svr-23.testcase
+++ b/test/build-server.basic2/build-svr-23.testcase
@@ -37,5 +37,4 @@ Error: No DB exists and create(migrate) DB first!
 Error: No DB exists and create(migrate) DB first!
 Error: No DB exists and create(migrate) DB first!
 Error: No DB exists and create(migrate) DB first!
-Error: No DB exists and create(migrate) DB first!
-Error: No DB exists and create(migrate) DB first!
+3