[Title] fix regression test

[Type] Enhancement
[Module] Toolchain /
[Priority] Major
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

Change-Id: Ifd5685de38f06fa9cc5cf0e1929a38aff814e729

diff --git a/src/pkg_server/client.rb b/src/pkg_server/client.rb
index 1e5fadbf0701249f345ac07839d5ee7aa56ac0c0..dd3284a7e1b7bbd842b613fad3201a9991edebe0 100644 (file)
--- a/src/pkg_server/client.rb
+++ b/src/pkg_server/client.rb
@@ -362,7 +362,6 @@ class Client
                $cache_mutex.synchronize do
                        @log.info "Entering cache sync",Log::LV_USER
                        cached_filepath = get_cached_filepath(filename, pkg_checksum, pkg_size)
-                       @log.info "Cache file path : #{cached_filepath}",Log::LV_USER
                        if not cached_filepath.nil? then
                                FileUtils.cp(cached_filepath, location)
                                downloaded_file_path = File.join(location, File.basename(cached_filepath))

diff --git a/test/build-server.basic1/build-cli-08.testcase b/test/build-server.basic1/build-cli-08.testcase
index 6d08be102e53e53f3726a31032ad87ff7994256a..20a322f43a5418726e97a106599901091a648482 100644 (file)
--- a/test/build-server.basic1/build-cli-08.testcase
+++ b/test/build-server.basic1/build-cli-08.testcase
@@ -16,6 +16,9 @@ Info: JobBuilder
 Info: Downloding client is initializing...
 Info: Installing dependent packages...
 Info:  * a
+Info: Wait for cache sync
+Info: Entering cache sync
+Info: Cache sync done
 Info: Downloading dependent source packages...
 Info: Make clean...
 Info: Make build...

diff --git a/test/build-server.basic1/build-cli-13.testcase b/test/build-server.basic1/build-cli-13.testcase
index 59fd045f83652e2876789d301c4e4d9eccfce97d..0e7187abc8d13edfe4092d06528b03c91bb083d9 100644 (file)
--- a/test/build-server.basic1/build-cli-13.testcase
+++ b/test/build-server.basic1/build-cli-13.testcase
@@ -21,7 +21,13 @@ Info: JobBuilder
 Info: Downloding client is initializing...
 Info: Installing dependent packages...
 Info:  * a
+Info: Wait for cache sync
+Info: Entering cache sync
+Info: Cache sync done
 Info:  * b
+Info: Wait for cache sync
+Info: Entering cache sync
+Info: Cache sync done
 Info: Downloading dependent source packages...
 Info: Make clean...
 Info: Make build...

diff --git a/test/build-server.basic1/build-cli-17.testcase b/test/build-server.basic1/build-cli-17.testcase
index 9653e453f90a0ac5dad52d56724f1effa466bb8a..cfc7d0aadd233bebececf09773fddfd693377232 100644 (file)
--- a/test/build-server.basic1/build-cli-17.testcase
+++ b/test/build-server.basic1/build-cli-17.testcase
@@ -24,6 +24,9 @@ Info: JobBuilder
 Info: Downloding client is initializing...
 Info: Installing dependent packages...
 Info:  * a
+Info: Wait for cache sync
+Info: Entering cache sync
+Info: Cache sync done
 Info: Downloading dependent source packages...
 Info: Make clean...
 Info: Make build...

diff --git a/test/build-server.basic1/build-cli-28.testcase b/test/build-server.basic1/build-cli-28.testcase
index 27dfb11ac541f4cc6062766b863936e0b170ae99..ea1c5b3985313dbdd1745721ba6bee4433507cc3 100644 (file)
--- a/test/build-server.basic1/build-cli-28.testcase
+++ b/test/build-server.basic1/build-cli-28.testcase
@@ -16,7 +16,13 @@ Info: JobBuilder
 Info: Downloding client is initializing...
 Info: Installing dependent packages...
 Info:  * a
+Info: Wait for cache sync
+Info: Entering cache sync
+Info: Cache sync done
 Info:  * b
+Info: Wait for cache sync
+Info: Entering cache sync
+Info: Cache sync done
 Info: Downloading dependent source packages...
 Info: Make clean...
 Info: Make build...

diff --git a/test/build-server.multi-svr1/02.testcase b/test/build-server.multi-svr1/02.testcase
index cbe7440e88822f0e4e60635307f643f385eff74e..c9ddc66a86d48848271a7642cd8a7cd3b6f74dea 100644 (file)
--- a/test/build-server.multi-svr1/02.testcase
+++ b/test/build-server.multi-svr1/02.testcase
@@ -22,6 +22,9 @@ Info: JobBuilder
 Info: Downloding client is initializing...
 Info: Installing dependent packages...
 Info:  * a
+Info: Wait for cache sync
+Info: Entering cache sync
+Info: Cache sync done
 Info: Downloading dependent source packages...
 Info: Make clean...
 Info: Make build...

diff --git a/test/build-server.multi_dist2/build-svr3-03.testcase b/test/build-server.multi_dist2/build-svr3-03.testcase
index fd3d663934bc266208a1783e19751b1547314b17..263c627384453bc4119935a1b15cf9b39d1f4f9a 100644 (file)
--- a/test/build-server.multi_dist2/build-svr3-03.testcase
+++ b/test/build-server.multi_dist2/build-svr3-03.testcase
@@ -8,6 +8,7 @@ I, [
 I, [
 I, [
 I, [
+I, [
 Info: Added new job
 Info: Initializing job...
 Info: Checking package version ...

diff --git a/test/build-server.multi_dist2/build-svr3-05.testcase b/test/build-server.multi_dist2/build-svr3-05.testcase
index 68365154946893d3a2b840b103f94dfa4417b998..a573ba717258d02ab6f0e8180b239e45b836baa9 100644 (file)
--- a/test/build-server.multi_dist2/build-svr3-05.testcase
+++ b/test/build-server.multi_dist2/build-svr3-05.testcase
@@ -30,6 +30,9 @@ Info: JobBuilder
 Info: Downloding client is initializing...
 Info: Installing dependent packages...
 Info:  * a
+Info: Wait for cache sync
+Info: Entering cache sync
+Info: Cache sync done
 Info: Downloading dependent source packages...
 Info: Make clean...
 Info: Make build...