[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 726b6093570bf057324e4de85f18344db5d75fb0..77ac1aa01b9a80865ac0f4e3f7ec15e029c74cec 100644 (file)
--- 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 0f25cb98d1a46ba5be026bf1211795d8d85974c9..20022adb356edc23781f7437ade3fb3b6bca3f98 100644 (file)
--- 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 ce6af1a435cfa5845a56e0d1ede442748c522004..87649e93897efddc64a89b202268b103ade453bb 100644 (file)
--- 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