From a61c0a1979e68d0873efe1ba837a4853ecc29c02 Mon Sep 17 00:00:00 2001 From: donghee yang Date: Fri, 5 Oct 2012 18:10:20 +0900 Subject: [PATCH] [Title] Refactored testcases for build server --- test/build-cli-06.testcase | 6 --- .../build-cli-01.testcase | 2 +- .../build-cli-02.testcase | 2 +- .../build-cli-03.testcase | 2 +- .../build-cli-03_1.testcase | 4 +- .../build-cli-04.testcase | 2 +- .../build-cli-05.testcase | 2 +- .../build-server.basic1/build-cli-06.testcase | 6 +++ .../build-cli-07.testcase | 2 +- .../build-cli-08.testcase | 2 +- .../build-cli-09.testcase | 6 +-- .../build-cli-10.testcase | 4 +- .../build-cli-11.testcase | 2 +- .../build-cli-12.testcase | 4 +- .../build-cli-12_1.testcase | 2 +- .../build-cli-13.testcase | 6 +-- .../build-cli-14.testcase | 2 +- .../build-cli-15.testcase | 2 +- .../build-cli-16.testcase | 2 +- .../build-cli-17.testcase | 10 ++--- .../build-cli-18.testcase | 2 +- .../build-cli-19.testcase | 2 +- .../build-cli-20.testcase | 2 +- .../build-cli-21.testcase | 2 +- .../build-cli-22.testcase | 2 +- .../build-cli-23.testcase | 2 +- .../build-cli-24.testcase | 2 +- .../build-cli-25.testcase | 2 +- .../build-cli-26.testcase | 2 +- .../build-cli-27.testcase | 2 +- .../build-cli-28.testcase | 2 +- .../build-cli-29.testcase | 2 +- test/build-server.basic1/buildsvr.init | 44 +++++++++++++++++++ test/build-server.basic1/pkgsvr.init | 7 +++ .../testsuite} | 0 .../build-server.basic2/build-svr-01.testcase | 11 +++++ .../build-svr-02.testcase | 2 +- .../build-server.basic2/build-svr-03.testcase | 23 ++++++++++ .../build-server.basic2/build-svr-04.testcase | 12 +++++ .../build-server.basic2/build-svr-05.testcase | 14 ++++++ .../build-server.basic2/build-svr-06.testcase | 10 +++++ .../build-server.basic2/build-svr-07.testcase | 9 ++++ .../build-server.basic2/build-svr-08.testcase | 12 +++++ .../build-svr-09.testcase | 2 +- .../build-svr-10.testcase | 2 +- .../build-server.basic2/build-svr-11.testcase | 12 +++++ .../build-server.basic2/build-svr-12.testcase | 6 +++ .../build-server.basic2/build-svr-13.testcase | 9 ++++ .../build-server.basic2/build-svr-14.testcase | 13 ++++++ .../build-svr-15.testcase | 6 +-- .../build-server.basic2/build-svr-16.testcase | 15 +++++++ .../build-server.basic2/build-svr-17.testcase | 23 ++++++++++ .../build-server.basic2/build-svr-18.testcase | 13 ++++++ .../build-server.basic2/build-svr-19.testcase | 16 +++++++ .../build-server.basic2/build-svr-20.testcase | 21 +++++++++ .../testsuite} | 0 .../build-svr2-01.testcase | 23 ++++++++++ .../build-svr2-02.testcase | 2 +- .../build-svr2-03.testcase | 4 +- .../build-svr2-04.testcase | 6 +-- .../build-svr2-05.testcase | 2 +- .../build-svr2-06.testcase | 18 ++++---- .../build-svr2-07.testcase | 26 +++++------ .../build-svr2-08.testcase | 6 +-- test/build-server.multi_dist1/testsuite | 8 ++++ .../build-svr3-01.testcase | 2 +- .../build-svr3-02.testcase | 4 +- .../build-svr3-03.testcase | 2 +- .../build-svr3-04.testcase | 2 +- test/build-server.multi_dist2/buildsvr.init | 35 +++++++++++++++ test/build-server.multi_dist2/pkgsvr.init | 10 +++++ test/build-server.multi_dist2/testsuite | 4 ++ test/build-svr-01.testcase | 11 ----- test/build-svr-03.testcase | 23 ---------- test/build-svr-04.testcase | 12 ----- test/build-svr-05.testcase | 14 ------ test/build-svr-06.testcase | 10 ----- test/build-svr-07.testcase | 9 ---- test/build-svr-08.testcase | 12 ----- test/build-svr-11.testcase | 12 ----- test/build-svr-12.testcase | 6 --- test/build-svr-13.testcase | 9 ---- test/build-svr-14.testcase | 12 ----- test/build-svr-16.testcase | 15 ------- test/build-svr-17.testcase | 23 ---------- test/build-svr-18.testcase | 13 ------ test/build-svr-19.testcase | 16 ------- test/build-svr-20.testcase | 20 --------- test/build-svr2-01.testcase | 18 -------- test/buildsvr.init | 32 -------------- test/buildsvr3.init | 7 --- test/buildsvr4.init | 24 ---------- test/pkgsvr.init | 7 --- test/pkgsvr4.init | 10 ----- 94 files changed, 440 insertions(+), 405 deletions(-) delete mode 100644 test/build-cli-06.testcase rename test/{ => build-server.basic1}/build-cli-01.testcase (98%) rename test/{ => build-server.basic1}/build-cli-02.testcase (91%) rename test/{ => build-server.basic1}/build-cli-03.testcase (93%) rename test/{ => build-server.basic1}/build-cli-03_1.testcase (87%) rename test/{ => build-server.basic1}/build-cli-04.testcase (67%) rename test/{ => build-server.basic1}/build-cli-05.testcase (50%) create mode 100644 test/build-server.basic1/build-cli-06.testcase rename test/{ => build-server.basic1}/build-cli-07.testcase (80%) rename test/{ => build-server.basic1}/build-cli-08.testcase (93%) rename test/{ => build-server.basic1}/build-cli-09.testcase (75%) rename test/{ => build-server.basic1}/build-cli-10.testcase (89%) rename test/{ => build-server.basic1}/build-cli-11.testcase (82%) rename test/{ => build-server.basic1}/build-cli-12.testcase (62%) rename test/{ => build-server.basic1}/build-cli-12_1.testcase (74%) rename test/{ => build-server.basic1}/build-cli-13.testcase (84%) rename test/{ => build-server.basic1}/build-cli-14.testcase (81%) rename test/{ => build-server.basic1}/build-cli-15.testcase (79%) rename test/{ => build-server.basic1}/build-cli-16.testcase (67%) rename test/{ => build-server.basic1}/build-cli-17.testcase (77%) rename test/{ => build-server.basic1}/build-cli-18.testcase (93%) rename test/{ => build-server.basic1}/build-cli-19.testcase (76%) rename test/{ => build-server.basic1}/build-cli-20.testcase (51%) rename test/{ => build-server.basic1}/build-cli-21.testcase (51%) rename test/{ => build-server.basic1}/build-cli-22.testcase (84%) rename test/{ => build-server.basic1}/build-cli-23.testcase (87%) rename test/{ => build-server.basic1}/build-cli-24.testcase (77%) rename test/{ => build-server.basic1}/build-cli-25.testcase (85%) rename test/{ => build-server.basic1}/build-cli-26.testcase (95%) rename test/{ => build-server.basic1}/build-cli-27.testcase (64%) rename test/{ => build-server.basic1}/build-cli-28.testcase (92%) rename test/{ => build-server.basic1}/build-cli-29.testcase (94%) create mode 100755 test/build-server.basic1/buildsvr.init create mode 100755 test/build-server.basic1/pkgsvr.init rename test/{buildcli.testsuite => build-server.basic1/testsuite} (100%) create mode 100644 test/build-server.basic2/build-svr-01.testcase rename test/{ => build-server.basic2}/build-svr-02.testcase (99%) create mode 100644 test/build-server.basic2/build-svr-03.testcase create mode 100644 test/build-server.basic2/build-svr-04.testcase create mode 100644 test/build-server.basic2/build-svr-05.testcase create mode 100644 test/build-server.basic2/build-svr-06.testcase create mode 100644 test/build-server.basic2/build-svr-07.testcase create mode 100644 test/build-server.basic2/build-svr-08.testcase rename test/{ => build-server.basic2}/build-svr-09.testcase (56%) rename test/{ => build-server.basic2}/build-svr-10.testcase (57%) create mode 100644 test/build-server.basic2/build-svr-11.testcase create mode 100644 test/build-server.basic2/build-svr-12.testcase create mode 100644 test/build-server.basic2/build-svr-13.testcase create mode 100644 test/build-server.basic2/build-svr-14.testcase rename test/{ => build-server.basic2}/build-svr-15.testcase (59%) create mode 100644 test/build-server.basic2/build-svr-16.testcase create mode 100644 test/build-server.basic2/build-svr-17.testcase create mode 100644 test/build-server.basic2/build-svr-18.testcase create mode 100644 test/build-server.basic2/build-svr-19.testcase create mode 100644 test/build-server.basic2/build-svr-20.testcase rename test/{buildserver.testsuite => build-server.basic2/testsuite} (100%) create mode 100644 test/build-server.multi_dist1/build-svr2-01.testcase rename test/{ => build-server.multi_dist1}/build-svr2-02.testcase (59%) rename test/{ => build-server.multi_dist1}/build-svr2-03.testcase (59%) rename test/{ => build-server.multi_dist1}/build-svr2-04.testcase (50%) rename test/{ => build-server.multi_dist1}/build-svr2-05.testcase (55%) rename test/{ => build-server.multi_dist1}/build-svr2-06.testcase (62%) rename test/{ => build-server.multi_dist1}/build-svr2-07.testcase (52%) rename test/{ => build-server.multi_dist1}/build-svr2-08.testcase (58%) create mode 100644 test/build-server.multi_dist1/testsuite rename test/{ => build-server.multi_dist2}/build-svr3-01.testcase (78%) rename test/{ => build-server.multi_dist2}/build-svr3-02.testcase (92%) rename test/{ => build-server.multi_dist2}/build-svr3-03.testcase (73%) rename test/{ => build-server.multi_dist2}/build-svr3-04.testcase (91%) create mode 100755 test/build-server.multi_dist2/buildsvr.init create mode 100755 test/build-server.multi_dist2/pkgsvr.init create mode 100644 test/build-server.multi_dist2/testsuite delete mode 100644 test/build-svr-01.testcase delete mode 100644 test/build-svr-03.testcase delete mode 100644 test/build-svr-04.testcase delete mode 100644 test/build-svr-05.testcase delete mode 100644 test/build-svr-06.testcase delete mode 100644 test/build-svr-07.testcase delete mode 100644 test/build-svr-08.testcase delete mode 100644 test/build-svr-11.testcase delete mode 100644 test/build-svr-12.testcase delete mode 100644 test/build-svr-13.testcase delete mode 100644 test/build-svr-14.testcase delete mode 100644 test/build-svr-16.testcase delete mode 100644 test/build-svr-17.testcase delete mode 100644 test/build-svr-18.testcase delete mode 100644 test/build-svr-19.testcase delete mode 100644 test/build-svr-20.testcase delete mode 100644 test/build-svr2-01.testcase delete mode 100755 test/buildsvr.init delete mode 100755 test/buildsvr3.init delete mode 100755 test/buildsvr4.init delete mode 100755 test/pkgsvr.init delete mode 100755 test/pkgsvr4.init diff --git a/test/build-cli-06.testcase b/test/build-cli-06.testcase deleted file mode 100644 index 308410f..0000000 --- a/test/build-cli-06.testcase +++ /dev/null @@ -1,6 +0,0 @@ -#PRE-EXEC -#EXEC -../build-cli build -N testa -d 111.11q.111.111:1111 -o ubuntu-32 -#POST-EXEC -#EXPECT -Connection to server failed! diff --git a/test/build-cli-01.testcase b/test/build-server.basic1/build-cli-01.testcase similarity index 98% rename from test/build-cli-01.testcase rename to test/build-server.basic1/build-cli-01.testcase index 670207d..4aa083b 100644 --- a/test/build-cli-01.testcase +++ b/test/build-server.basic1/build-cli-01.testcase @@ -1,6 +1,6 @@ #PRE-EXEC #EXEC -../build-cli -h +../../build-cli -h #POST-EXEC #EXPECT Requiest service to build-server command-line tool. diff --git a/test/build-cli-02.testcase b/test/build-server.basic1/build-cli-02.testcase similarity index 91% rename from test/build-cli-02.testcase rename to test/build-server.basic1/build-cli-02.testcase index 4b13c12..4d821bd 100644 --- a/test/build-cli-02.testcase +++ b/test/build-server.basic1/build-cli-02.testcase @@ -1,6 +1,6 @@ #PRE-EXEC #EXEC -../build-cli query -d 127.0.0.1:2223 +../../build-cli query -d 127.0.0.1:2223 #POST-EXEC #EXPECT * SYSTEM INFO * diff --git a/test/build-cli-03.testcase b/test/build-server.basic1/build-cli-03.testcase similarity index 93% rename from test/build-cli-03.testcase rename to test/build-server.basic1/build-cli-03.testcase index 4641ffb..b084d40 100644 --- a/test/build-cli-03.testcase +++ b/test/build-server.basic1/build-cli-03.testcase @@ -1,6 +1,6 @@ #PRE-EXEC #EXEC -../build-cli build -N testa -d 127.0.0.1:2223 -o ubuntu-32 +../../build-cli build -N testa -d 127.0.0.1:2223 -o ubuntu-32 #POST-EXEC #EXPECT Info: Added new job diff --git a/test/build-cli-03_1.testcase b/test/build-server.basic1/build-cli-03_1.testcase similarity index 87% rename from test/build-cli-03_1.testcase rename to test/build-server.basic1/build-cli-03_1.testcase index f082adf..5324ae3 100644 --- a/test/build-cli-03_1.testcase +++ b/test/build-server.basic1/build-cli-03_1.testcase @@ -1,8 +1,8 @@ #PRE-EXEC echo "This is the test case for omitting os" -../pkg-svr remove-pkg -n pkgsvr01 -d unstable -P a +../../pkg-svr remove-pkg -n pkgsvr01 -d unstable -P a #EXEC -../build-cli build -N testa -d 127.0.0.1:2223 +../../build-cli build -N testa -d 127.0.0.1:2223 #POST-EXEC #EXPECT Info: Added new job diff --git a/test/build-cli-04.testcase b/test/build-server.basic1/build-cli-04.testcase similarity index 67% rename from test/build-cli-04.testcase rename to test/build-server.basic1/build-cli-04.testcase index f6b338e..0ab1208 100644 --- a/test/build-cli-04.testcase +++ b/test/build-server.basic1/build-cli-04.testcase @@ -1,6 +1,6 @@ #PRE-EXEC #EXEC -../build-cli build -N non_exist_project -d 127.0.0.1:2223 -o ubuntu-32 +../../build-cli build -N non_exist_project -d 127.0.0.1:2223 -o ubuntu-32 #POST-EXEC #EXPECT Error: Requested project "non_exist_project" does not exist! diff --git a/test/build-cli-05.testcase b/test/build-server.basic1/build-cli-05.testcase similarity index 50% rename from test/build-cli-05.testcase rename to test/build-server.basic1/build-cli-05.testcase index 039eb37..0072e13 100644 --- a/test/build-cli-05.testcase +++ b/test/build-server.basic1/build-cli-05.testcase @@ -1,6 +1,6 @@ #PRE-EXEC #EXEC -../build-cli build -N testa -d 127.0.0.1:11113 -o ubuntu-32 +../../build-cli build -N testa -d 127.0.0.1:11113 -o ubuntu-32 #POST-EXEC #EXPECT Connection to server failed! diff --git a/test/build-server.basic1/build-cli-06.testcase b/test/build-server.basic1/build-cli-06.testcase new file mode 100644 index 0000000..1682338 --- /dev/null +++ b/test/build-server.basic1/build-cli-06.testcase @@ -0,0 +1,6 @@ +#PRE-EXEC +#EXEC +../../build-cli build -N testa -d 111.11q.111.111:1111 -o ubuntu-32 +#POST-EXEC +#EXPECT +Connection to server failed! diff --git a/test/build-cli-07.testcase b/test/build-server.basic1/build-cli-07.testcase similarity index 80% rename from test/build-cli-07.testcase rename to test/build-server.basic1/build-cli-07.testcase index d59ca4c..10e64d4 100644 --- a/test/build-cli-07.testcase +++ b/test/build-server.basic1/build-cli-07.testcase @@ -1,7 +1,7 @@ #PRE-EXEC echo "testa project is already built and uploaded in previeous testcase" #EXEC -../build-cli build -N testa -d 127.0.0.1:2223 -o ubuntu-32 +../../build-cli build -N testa -d 127.0.0.1:2223 -o ubuntu-32 #POST-EXEC #EXPECT Info: Added new job diff --git a/test/build-cli-08.testcase b/test/build-server.basic1/build-cli-08.testcase similarity index 93% rename from test/build-cli-08.testcase rename to test/build-server.basic1/build-cli-08.testcase index ff51d73..6d08be1 100644 --- a/test/build-cli-08.testcase +++ b/test/build-server.basic1/build-cli-08.testcase @@ -1,7 +1,7 @@ #PRE-EXEC echo "Assume testa project is already built and uploaded in previeous testcase" #EXEC -../build-cli build -N testb -d 127.0.0.1:2223 -o ubuntu-32 +../../build-cli build -N testb -d 127.0.0.1:2223 -o ubuntu-32 #POST-EXEC #EXPECT Info: Added new job diff --git a/test/build-cli-09.testcase b/test/build-server.basic1/build-cli-09.testcase similarity index 75% rename from test/build-cli-09.testcase rename to test/build-server.basic1/build-cli-09.testcase index 676cd46..b20cb5b 100644 --- a/test/build-cli-09.testcase +++ b/test/build-server.basic1/build-cli-09.testcase @@ -1,10 +1,10 @@ #PRE-EXEC echo "if build-dep package does not exist in server, will show the error" echo "Assume testa/testb project is already built and uploaded in previeous testcase" -../pkg-svr remove-pkg -n pkgsvr01 -d unstable -P b -../pkg-svr remove-pkg -n pkgsvr01 -d unstable -P a +../../pkg-svr remove-pkg -n pkgsvr01 -d unstable -P b +../../pkg-svr remove-pkg -n pkgsvr01 -d unstable -P a #EXEC -../build-cli build -N testb -d 127.0.0.1:2223 -o ubuntu-32 +../../build-cli build -N testb -d 127.0.0.1:2223 -o ubuntu-32 #POST-EXEC #EXPECT Info: Added new job diff --git a/test/build-cli-10.testcase b/test/build-server.basic1/build-cli-10.testcase similarity index 89% rename from test/build-cli-10.testcase rename to test/build-server.basic1/build-cli-10.testcase index 7ca3ce7..c585766 100644 --- a/test/build-cli-10.testcase +++ b/test/build-server.basic1/build-cli-10.testcase @@ -1,8 +1,8 @@ #PRE-EXEC echo "This is the test case for omitting os" -../pkg-svr remove-pkg -n pkgsvr01 -d unstable -P a +../../pkg-svr remove-pkg -n pkgsvr01 -d unstable -P a #EXEC -../build-cli build -N testa -d 127.0.0.1:2223 +../../build-cli build -N testa -d 127.0.0.1:2223 #POST-EXEC #EXPECT Info: Added new job diff --git a/test/build-cli-11.testcase b/test/build-server.basic1/build-cli-11.testcase similarity index 82% rename from test/build-cli-11.testcase rename to test/build-server.basic1/build-cli-11.testcase index 87e1de1..beb3e82 100644 --- a/test/build-cli-11.testcase +++ b/test/build-server.basic1/build-cli-11.testcase @@ -1,7 +1,7 @@ #PRE-EXEC echo "if there doe not exist server to build, error" #EXEC -../build-cli build -N testa -d 127.0.0.1:2223 -o windows-32 +../../build-cli build -N testa -d 127.0.0.1:2223 -o windows-32 #POST-EXEC #EXPECT Info: Added new job "5" for windows-32! diff --git a/test/build-cli-12.testcase b/test/build-server.basic1/build-cli-12.testcase similarity index 62% rename from test/build-cli-12.testcase rename to test/build-server.basic1/build-cli-12.testcase index 7c4154b..d1a9353 100644 --- a/test/build-cli-12.testcase +++ b/test/build-server.basic1/build-cli-12.testcase @@ -1,8 +1,8 @@ #PRE-EXEC echo "wrong os name in build command" -../pkg-svr remove-pkg -n pkgsvr01 -d unstable -P a +../../pkg-svr remove-pkg -n pkgsvr01 -d unstable -P a #EXEC -../build-cli build -N testa -d 127.0.0.1:2223 -o wrong_os_name +../../build-cli build -N testa -d 127.0.0.1:2223 -o wrong_os_name #POST-EXEC #EXPECT Error: Unsupported OS name "wrong_os_name" is used! diff --git a/test/build-cli-12_1.testcase b/test/build-server.basic1/build-cli-12_1.testcase similarity index 74% rename from test/build-cli-12_1.testcase rename to test/build-server.basic1/build-cli-12_1.testcase index efaa7cf..f53b6f5 100644 --- a/test/build-cli-12_1.testcase +++ b/test/build-server.basic1/build-cli-12_1.testcase @@ -1,7 +1,7 @@ #PRE-EXEC echo "wrong os name in resolve command" #EXEC -../build-cli resolve -N testa -d 127.0.0.1:2223 -o wrong_os_name +../../build-cli resolve -N testa -d 127.0.0.1:2223 -o wrong_os_name #POST-EXEC #EXPECT Error: Unsupported OS name "wrong_os_name" is used! diff --git a/test/build-cli-13.testcase b/test/build-server.basic1/build-cli-13.testcase similarity index 84% rename from test/build-cli-13.testcase rename to test/build-server.basic1/build-cli-13.testcase index b0bbc1f..59fd045 100644 --- a/test/build-cli-13.testcase +++ b/test/build-server.basic1/build-cli-13.testcase @@ -3,10 +3,10 @@ echo "Assume that testc project has the password (1111)" echo "Assume that testa,testb which are depended by testc are built and uploaded" echo "For, work around solution, removed cache" rm -rf buildsvr01/projects/testa/cache -../build-cli build -N testa -d 127.0.0.1:2223 -o ubuntu-32 -../build-cli build -N testb -d 127.0.0.1:2223 -o ubuntu-32 +../../build-cli build -N testa -d 127.0.0.1:2223 -o ubuntu-32 +../../build-cli build -N testb -d 127.0.0.1:2223 -o ubuntu-32 #EXEC -../build-cli build -N testc -d 127.0.0.1:2223 -w 1111 -o ubuntu-32 +../../build-cli build -N testc -d 127.0.0.1:2223 -w 1111 -o ubuntu-32 #POST-EXEC #EXPECT Info: Added new job diff --git a/test/build-cli-14.testcase b/test/build-server.basic1/build-cli-14.testcase similarity index 81% rename from test/build-cli-14.testcase rename to test/build-server.basic1/build-cli-14.testcase index de41149..3a7107b 100644 --- a/test/build-cli-14.testcase +++ b/test/build-server.basic1/build-cli-14.testcase @@ -2,7 +2,7 @@ echo "Assume that testc project has the password (1111)" echo "Assume that testa,testb which are depended by testc are built and uploaded" #EXEC -../build-cli build -N testc -d 127.0.0.1:2223 -o ubuntu-32 +../../build-cli build -N testc -d 127.0.0.1:2223 -o ubuntu-32 #POST-EXEC #EXPECT Error: Project's password is not matched! diff --git a/test/build-cli-15.testcase b/test/build-server.basic1/build-cli-15.testcase similarity index 79% rename from test/build-cli-15.testcase rename to test/build-server.basic1/build-cli-15.testcase index 523375a..dd8305c 100644 --- a/test/build-cli-15.testcase +++ b/test/build-server.basic1/build-cli-15.testcase @@ -2,7 +2,7 @@ echo "Assume that testc project has the password (1111)" echo "Assume that testa,testb which are depended by testc are built and uploaded" #EXEC -../build-cli build -N testc -d 127.0.0.1:2223 -w 2222 -o ubuntu-32 +../../build-cli build -N testc -d 127.0.0.1:2223 -w 2222 -o ubuntu-32 #POST-EXEC #EXPECT Error: Project's password is not matched! diff --git a/test/build-cli-16.testcase b/test/build-server.basic1/build-cli-16.testcase similarity index 67% rename from test/build-cli-16.testcase rename to test/build-server.basic1/build-cli-16.testcase index fd31b9a..1f798aa 100644 --- a/test/build-cli-16.testcase +++ b/test/build-server.basic1/build-cli-16.testcase @@ -1,7 +1,7 @@ #PRE-EXEC ../pkg-svr remove-pkg -n pkgsvr01 -d unstable -P c #EXEC -../build-cli build -N testc -d 127.0.0.1:2223 -w 1111 --async -o ubuntu-32 +../../build-cli build -N testc -d 127.0.0.1:2223 -w 1111 --async -o ubuntu-32 #POST-EXEC #EXPECT Info: Added new job diff --git a/test/build-cli-17.testcase b/test/build-server.basic1/build-cli-17.testcase similarity index 77% rename from test/build-cli-17.testcase rename to test/build-server.basic1/build-cli-17.testcase index 230f75e..9653e45 100644 --- a/test/build-cli-17.testcase +++ b/test/build-server.basic1/build-cli-17.testcase @@ -1,11 +1,11 @@ #PRE-EXEC -../pkg-svr remove-pkg -n pkgsvr01 -d unstable -P c -../pkg-svr remove-pkg -n pkgsvr01 -d unstable -P b -../pkg-svr remove-pkg -n pkgsvr01 -d unstable -P a +../../pkg-svr remove-pkg -n pkgsvr01 -d unstable -P c +../../pkg-svr remove-pkg -n pkgsvr01 -d unstable -P b +../../pkg-svr remove-pkg -n pkgsvr01 -d unstable -P a #EXEC -../build-cli build -N testa -d 127.0.0.1:2223 --async -o ubuntu-32 +../../build-cli build -N testa -d 127.0.0.1:2223 --async -o ubuntu-32 sleep 1 -../build-cli build -N testb -d 127.0.0.1:2223 -o ubuntu-32 +../../build-cli build -N testb -d 127.0.0.1:2223 -o ubuntu-32 #POST-EXEC #EXPECT Info: Added new job diff --git a/test/build-cli-18.testcase b/test/build-server.basic1/build-cli-18.testcase similarity index 93% rename from test/build-cli-18.testcase rename to test/build-server.basic1/build-cli-18.testcase index 136daf7..6c8a769 100644 --- a/test/build-cli-18.testcase +++ b/test/build-server.basic1/build-cli-18.testcase @@ -3,7 +3,7 @@ echo "reverse fail" #EXEC rm -rf git01/a cd git01;tar xf a_v2.tar.gz -../build-cli build -N testa -d 127.0.0.1:2223 -o ubuntu-32 +../../build-cli build -N testa -d 127.0.0.1:2223 -o ubuntu-32 #POST-EXEC #EXPECT Info: Added new job diff --git a/test/build-cli-19.testcase b/test/build-server.basic1/build-cli-19.testcase similarity index 76% rename from test/build-cli-19.testcase rename to test/build-server.basic1/build-cli-19.testcase index f48aab6..076004e 100644 --- a/test/build-cli-19.testcase +++ b/test/build-server.basic1/build-cli-19.testcase @@ -1,6 +1,6 @@ #PRE-EXEC #EXEC -../build-cli query-system -d 127.0.0.1:2223 +../../build-cli query-system -d 127.0.0.1:2223 #POST-EXEC #EXPECT * SYSTEM INFO * diff --git a/test/build-cli-20.testcase b/test/build-server.basic1/build-cli-20.testcase similarity index 51% rename from test/build-cli-20.testcase rename to test/build-server.basic1/build-cli-20.testcase index 7f048f5..e475cf8 100644 --- a/test/build-cli-20.testcase +++ b/test/build-server.basic1/build-cli-20.testcase @@ -1,6 +1,6 @@ #PRE-EXEC #EXEC -../build-cli query-project -d 127.0.0.1:2223 +../../build-cli query-project -d 127.0.0.1:2223 #POST-EXEC #EXPECT * PROJECT(S) * diff --git a/test/build-cli-21.testcase b/test/build-server.basic1/build-cli-21.testcase similarity index 51% rename from test/build-cli-21.testcase rename to test/build-server.basic1/build-cli-21.testcase index bd1503a..5de4383 100644 --- a/test/build-cli-21.testcase +++ b/test/build-server.basic1/build-cli-21.testcase @@ -1,6 +1,6 @@ #PRE-EXEC #EXEC -../build-cli query-job -d 127.0.0.1:2223 +../../build-cli query-job -d 127.0.0.1:2223 #POST-EXEC #EXPECT * JOB(S) * diff --git a/test/build-cli-22.testcase b/test/build-server.basic1/build-cli-22.testcase similarity index 84% rename from test/build-cli-22.testcase rename to test/build-server.basic1/build-cli-22.testcase index 6f4e6d5..9ee83c9 100644 --- a/test/build-cli-22.testcase +++ b/test/build-server.basic1/build-cli-22.testcase @@ -3,7 +3,7 @@ echo "Trying to upload a_0.0.1 with different commit-id is already uploaded" rm -rf git01/c cd git01;tar xf c_v1_1.tar.gz #EXEC -../build-cli build -N testc -d 127.0.0.1:2223 -o ubuntu-32 -w 1111 +../../build-cli build -N testc -d 127.0.0.1:2223 -o ubuntu-32 -w 1111 #POST-EXEC #EXPECT Info: Added new job diff --git a/test/build-cli-23.testcase b/test/build-server.basic1/build-cli-23.testcase similarity index 87% rename from test/build-cli-23.testcase rename to test/build-server.basic1/build-cli-23.testcase index 9645f35..44ff734 100644 --- a/test/build-cli-23.testcase +++ b/test/build-server.basic1/build-cli-23.testcase @@ -3,7 +3,7 @@ cd git01;tar xf a_v2.tar.gz cd git01;tar xf b_v2.tar.gz cd git01;tar xf c_v2.tar.gz #EXEC -../build-cli build -N testa,testb,testc -d 127.0.0.1:2223 -o ubuntu-32 -w 1111 +../../build-cli build -N testa,testb,testc -d 127.0.0.1:2223 -o ubuntu-32 -w 1111 #POST-EXEC #EXPECT Info: Added new job diff --git a/test/build-cli-24.testcase b/test/build-server.basic1/build-cli-24.testcase similarity index 77% rename from test/build-cli-24.testcase rename to test/build-server.basic1/build-cli-24.testcase index e858d32..de1b348 100644 --- a/test/build-cli-24.testcase +++ b/test/build-server.basic1/build-cli-24.testcase @@ -1,7 +1,7 @@ #PRE-EXEC echo "This test case must be execute right after testcase 22" #EXEC -../build-cli build -N testa,testb,testc -d 127.0.0.1:2223 -o ubuntu-32 -w 1111 +../../build-cli build -N testa,testb,testc -d 127.0.0.1:2223 -o ubuntu-32 -w 1111 #POST-EXEC #EXPECT Info: Added new job diff --git a/test/build-cli-25.testcase b/test/build-server.basic1/build-cli-25.testcase similarity index 85% rename from test/build-cli-25.testcase rename to test/build-server.basic1/build-cli-25.testcase index a9287f8..adaeb98 100644 --- a/test/build-cli-25.testcase +++ b/test/build-server.basic1/build-cli-25.testcase @@ -1,7 +1,7 @@ #PRE-EXEC cd git01;tar xf a_v3.tar.gz #EXEC -../build-cli build -N testa -d 127.0.0.1:2223 -o ubuntu-32,windows-32 +../../build-cli build -N testa -d 127.0.0.1:2223 -o ubuntu-32,windows-32 #POST-EXEC #EXPECT Info: Added new job diff --git a/test/build-cli-26.testcase b/test/build-server.basic1/build-cli-26.testcase similarity index 95% rename from test/build-cli-26.testcase rename to test/build-server.basic1/build-cli-26.testcase index b3c0684..eb0965c 100644 --- a/test/build-cli-26.testcase +++ b/test/build-server.basic1/build-cli-26.testcase @@ -6,7 +6,7 @@ cd git01;tar xf a_v4.tar.gz cd git01;tar xf b_v4.tar.gz cd git01;tar xf c_v4.tar.gz #EXEC -../build-svr fullbuild -n testserver3 +../../build-svr fullbuild -n testserver3 #POST-EXEC #EXPECT Info: Initializing job... diff --git a/test/build-cli-27.testcase b/test/build-server.basic1/build-cli-27.testcase similarity index 64% rename from test/build-cli-27.testcase rename to test/build-server.basic1/build-cli-27.testcase index b40b9b7..60c8889 100644 --- a/test/build-cli-27.testcase +++ b/test/build-server.basic1/build-cli-27.testcase @@ -1,7 +1,7 @@ #PRE-EXEC cd git01;tar xf c_v5.tar.gz #EXEC -../build-cli build -N testc -d 127.0.0.1:2223 -o li_* -w 1111 +../../build-cli build -N testc -d 127.0.0.1:2223 -o li_* -w 1111 #POST-EXEC #EXPECT Error: There is no OS supported by the build server. diff --git a/test/build-cli-28.testcase b/test/build-server.basic1/build-cli-28.testcase similarity index 92% rename from test/build-cli-28.testcase rename to test/build-server.basic1/build-cli-28.testcase index 04cc21e..27dfb11 100644 --- a/test/build-cli-28.testcase +++ b/test/build-server.basic1/build-cli-28.testcase @@ -1,7 +1,7 @@ #PRE-EXEC echo "wild card" #EXEC -../build-cli build -N testc -d 127.0.0.1:2223 -o ubuntu-* -w 1111 +../../build-cli build -N testc -d 127.0.0.1:2223 -o ubuntu-* -w 1111 #POST-EXEC #EXPECT Info: Added new job diff --git a/test/build-cli-29.testcase b/test/build-server.basic1/build-cli-29.testcase similarity index 94% rename from test/build-cli-29.testcase rename to test/build-server.basic1/build-cli-29.testcase index c927bae..47d1580 100644 --- a/test/build-cli-29.testcase +++ b/test/build-server.basic1/build-cli-29.testcase @@ -3,7 +3,7 @@ echo "reverse success" #EXEC rm -rf git01/a cd git01;tar xf a_v5.tar.gz -../build-cli build -N testa -d 127.0.0.1:2223 -o ubuntu-32 +../../build-cli build -N testa -d 127.0.0.1:2223 -o ubuntu-32 #POST-EXEC #EXPECT Info: Added new job diff --git a/test/build-server.basic1/buildsvr.init b/test/build-server.basic1/buildsvr.init new file mode 100755 index 0000000..408c7fd --- /dev/null +++ b/test/build-server.basic1/buildsvr.init @@ -0,0 +1,44 @@ +#!/bin/sh + +rm -rf buildsvr01 +rm -rf git01 +rm -rf bin +rm -rf ~/.build_tools/build_server/testserver3 + +../../build-svr remove -n testserver3 +mkdir buildsvr01 +cd buildsvr01 +../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://ftpuser:ftpuser@127.0.0.1 +cd .. + +../../build-svr add-svr -n testserver3 -d 127.0.0.1:2224 +../../build-svr add-os -n testserver3 -o ubuntu-32 +../../build-svr add-os -n testserver3 -o windows-32 +../../build-svr add-prj -n testserver3 -N testa -g `pwd`/git01/a -b master +../../build-svr add-prj -n testserver3 -N testb -g `pwd`/git01/b -b master +../../build-svr add-prj -n testserver3 -N testc -g `pwd`/git01/c -b master -w 1111 +../../build-svr add-prj -n testserver3 -N testd -g `pwd`/git01/d -b master -o ubuntu-32 +../../build-svr add-prj -n testserver3 -N teste -P bin +../../build-svr add-prj -n testserver3 -N testa1 -g `pwd`/git01/a1 -b master + +mkdir -p git01 +cp ../git01/*.tar.gz git01/ +cd git01 +rm -rf a +rm -rf a1 +rm -rf b +rm -rf c +rm -rf d +tar xvf a_v1.tar.gz +tar xvf b_v1.tar.gz +tar xvf c_v1.tar.gz +tar xvf d_v0.tar.gz +tar xvf a1_v1.tar.gz +cd .. + +mkdir -p bin +cp ../bin/* bin/ + +../../pkg-svr register -n pkgsvr01 -d unstable -P bin/bin_0.0.0_ubuntu-32.zip + +ruby -d ../../build-svr start -n testserver3 -p 2223 --CHILD diff --git a/test/build-server.basic1/pkgsvr.init b/test/build-server.basic1/pkgsvr.init new file mode 100755 index 0000000..26c9ef6 --- /dev/null +++ b/test/build-server.basic1/pkgsvr.init @@ -0,0 +1,7 @@ +#!/bin/sh +rm -rf ~/.build_tools/pkg_server/pkgsvr01 +rm -rf `pwd`/pkgsvr01 +ruby -d ../../pkg-svr create -n pkgsvr01 -d unstable +ruby -d ../../pkg-svr add-os -n pkgsvr01 -d unstable -o ubuntu-32 +ruby -d ../../pkg-svr add-os -n pkgsvr01 -d unstable -o windows-32 +ruby -d ../../pkg-svr start -n pkgsvr01 -p 3333 diff --git a/test/buildcli.testsuite b/test/build-server.basic1/testsuite similarity index 100% rename from test/buildcli.testsuite rename to test/build-server.basic1/testsuite diff --git a/test/build-server.basic2/build-svr-01.testcase b/test/build-server.basic2/build-svr-01.testcase new file mode 100644 index 0000000..f9617b1 --- /dev/null +++ b/test/build-server.basic2/build-svr-01.testcase @@ -0,0 +1,11 @@ +#PRE-EXEC +rm -rf ~/.build_tools/build_server/testserver3 +rm -rf buildsvr01 +mkdir buildsvr01 +#EXEC +cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://ftpuser:ftpuser@172.21.111.124 +#POST-EXEC +../../build-svr remove -n testserver3 +rm -rf buildsvr01 +#EXPECT +Created new build server: "testserver3" diff --git a/test/build-svr-02.testcase b/test/build-server.basic2/build-svr-02.testcase similarity index 99% rename from test/build-svr-02.testcase rename to test/build-server.basic2/build-svr-02.testcase index 7f31176..8c5e870 100644 --- a/test/build-svr-02.testcase +++ b/test/build-server.basic2/build-svr-02.testcase @@ -1,6 +1,6 @@ #PRE-EXEC #EXEC -../build-svr -h +../../build-svr -h #POST-EXEC #EXPECT Build-server administer service command-line tool. diff --git a/test/build-server.basic2/build-svr-03.testcase b/test/build-server.basic2/build-svr-03.testcase new file mode 100644 index 0000000..b95b1ee --- /dev/null +++ b/test/build-server.basic2/build-svr-03.testcase @@ -0,0 +1,23 @@ +#PRE-EXEC +rm -rf buildsvr01 +mkdir buildsvr01 +cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 +#EXEC +../../build-svr add-svr -n testserver3 -d 127.0.0.1:2223 +../../build-svr query -n testserver3 +#POST-EXEC +../../build-svr remove -n testserver3 +rm -rf buildsvr01 +#EXPECT +Friend server is added successfully! +* REMOTE SERVER(S) * +* 127.0.0.1:2223 + +* SUPPORTED OS * + +* DISTRIBUTION(S) * +* BASE + +* SYNC PACKAGE SERVER(S) * + +* PROJECT(S) * diff --git a/test/build-server.basic2/build-svr-04.testcase b/test/build-server.basic2/build-svr-04.testcase new file mode 100644 index 0000000..985f511 --- /dev/null +++ b/test/build-server.basic2/build-svr-04.testcase @@ -0,0 +1,12 @@ +#PRE-EXEC +rm -rf ~/.build_tools/build_server/testserver3 +rm -rf buildsvr01 +mkdir buildsvr01 +cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 +#EXEC +echo "TEST_TIME=3" >> ~/.build_tools/build_server/testserver3/server.cfg +../../build-svr start -n testserver3 -p 2223 +#POST-EXEC +../../build-svr remove -n testserver3 +rm -rf buildsvr01 +#EXPECT diff --git a/test/build-server.basic2/build-svr-05.testcase b/test/build-server.basic2/build-svr-05.testcase new file mode 100644 index 0000000..7e5f10b --- /dev/null +++ b/test/build-server.basic2/build-svr-05.testcase @@ -0,0 +1,14 @@ +#PRE-EXEC +mkdir buildsvr01 +rm -rf ~/.build_tools/build_server/testserver3 +cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 +../../build-svr start -n testserver3 -p 2223 & +#EXEC +sleep 1 +../../build-svr stop -n testserver3 +sleep 1 +#POST-EXEC +../../build-svr remove -n testserver3 +rm -rf buildsvr01 +#EXPECT +Server will be down! diff --git a/test/build-server.basic2/build-svr-06.testcase b/test/build-server.basic2/build-svr-06.testcase new file mode 100644 index 0000000..b4c65d4 --- /dev/null +++ b/test/build-server.basic2/build-svr-06.testcase @@ -0,0 +1,10 @@ +#PRE-EXEC +mkdir buildsvr01 +cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 +#EXEC +../../build-svr stop -n testserver3 +#POST-EXEC +../../build-svr remove -n testserver3 +rm -rf buildsvr01 +#EXPECT +Server is not running! diff --git a/test/build-server.basic2/build-svr-07.testcase b/test/build-server.basic2/build-svr-07.testcase new file mode 100644 index 0000000..b5518f5 --- /dev/null +++ b/test/build-server.basic2/build-svr-07.testcase @@ -0,0 +1,9 @@ +#PRE-EXEC +mkdir buildsvr01 +cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 +#EXEC +../../build-svr remove -n testserver3 +#POST-EXEC +rm -rf buildsvr01 +#EXPECT +Removed the server diff --git a/test/build-server.basic2/build-svr-08.testcase b/test/build-server.basic2/build-svr-08.testcase new file mode 100644 index 0000000..3ab2171 --- /dev/null +++ b/test/build-server.basic2/build-svr-08.testcase @@ -0,0 +1,12 @@ +#PRE-EXEC +rm -rf ~/.build_tools/build_server/testserver3 +rm -rf buildsvr01 +mkdir buildsvr01 +cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 +#EXEC +cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 +#POST-EXEC +../../build-svr remove -n testserver3 +rm -rf buildsvr01 +#EXPECT +Creating server failed. The server id is already exist diff --git a/test/build-svr-09.testcase b/test/build-server.basic2/build-svr-09.testcase similarity index 56% rename from test/build-svr-09.testcase rename to test/build-server.basic2/build-svr-09.testcase index 0554f0b..2a301eb 100644 --- a/test/build-svr-09.testcase +++ b/test/build-server.basic2/build-svr-09.testcase @@ -1,6 +1,6 @@ #PRE-EXEC #EXEC -../build-svr remove -n testserverxx +../../build-svr remove -n testserverxx #POST-EXEC #EXPECT does not exist! diff --git a/test/build-svr-10.testcase b/test/build-server.basic2/build-svr-10.testcase similarity index 57% rename from test/build-svr-10.testcase rename to test/build-server.basic2/build-svr-10.testcase index 126e55f..1d3f863 100644 --- a/test/build-svr-10.testcase +++ b/test/build-server.basic2/build-svr-10.testcase @@ -1,6 +1,6 @@ #PRE-EXEC #EXEC -../build-svr start -n testserverxx +../../build-svr start -n testserverxx #POST-EXEC #EXPECT does not exist! diff --git a/test/build-server.basic2/build-svr-11.testcase b/test/build-server.basic2/build-svr-11.testcase new file mode 100644 index 0000000..77fd62e --- /dev/null +++ b/test/build-server.basic2/build-svr-11.testcase @@ -0,0 +1,12 @@ +#PRE-EXEC +rm -rf buildsvr01 +mkdir buildsvr01 +cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 +../../build-svr add-os -n testserver3 -o linux +#EXEC +../../build-svr add-prj -n testserver3 -N testa -g test_git -b test_branch +#POST-EXEC +../../build-svr remove -n testserver3 +rm -rf buildsvr01 +#EXPECT +Adding project succeeded! diff --git a/test/build-server.basic2/build-svr-12.testcase b/test/build-server.basic2/build-svr-12.testcase new file mode 100644 index 0000000..1dcbb18 --- /dev/null +++ b/test/build-server.basic2/build-svr-12.testcase @@ -0,0 +1,6 @@ +#PRE-EXEC +#EXEC +../../build-svr add-prj -n testserverxxx -N testa -g test_git -b test_branch +#POST-EXEC +#EXPECT +does not exist! diff --git a/test/build-server.basic2/build-svr-13.testcase b/test/build-server.basic2/build-svr-13.testcase new file mode 100644 index 0000000..de77d15 --- /dev/null +++ b/test/build-server.basic2/build-svr-13.testcase @@ -0,0 +1,9 @@ +#PRE-EXEC +rm -rf buildsvr01 +mkdir buildsvr01 +cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 +#EXEC +../../build-svr add-prj -n testserver3 -N testa -g test_git -b test_branch -w 1111 +#POST-EXEC +#EXPECT +Adding project succeeded! diff --git a/test/build-server.basic2/build-svr-14.testcase b/test/build-server.basic2/build-svr-14.testcase new file mode 100644 index 0000000..20e84d6 --- /dev/null +++ b/test/build-server.basic2/build-svr-14.testcase @@ -0,0 +1,13 @@ +#PRE-EXEC +rm -rf buildsvr01 +rm -rf ~/.build_tools/build_server/testserver3 +mkdir buildsvr01 +cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://ftpuser:ftpuser@127.0.0.1 +../../build-svr add-os -n testserver3 -o linux +#EXEC +../../build-svr add-prj -n testserver3 -N testx -g test_git -b test_branch -o linux +#POST-EXEC +../../build-svr remove -n testserver3 +rm -rf buildsvr01 +#EXPECT +Adding project succeeded! diff --git a/test/build-svr-15.testcase b/test/build-server.basic2/build-svr-15.testcase similarity index 59% rename from test/build-svr-15.testcase rename to test/build-server.basic2/build-svr-15.testcase index 7574a81..dfdbfbc 100644 --- a/test/build-svr-15.testcase +++ b/test/build-server.basic2/build-svr-15.testcase @@ -1,11 +1,11 @@ #PRE-EXEC rm -rf buildsvr01 mkdir buildsvr01 -cd buildsvr01; ../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 +cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 #EXEC -../build-svr register -n testserver3 -P bin/bin_0.0.0_linux.zip +../../build-svr register -n testserver3 -P bin/bin_0.0.0_linux.zip #POST-EXEC -../build-svr remove -n testserver3 +../../build-svr remove -n testserver3 rm -rf buildsvr01 #EXPECT Info: Initializing job... diff --git a/test/build-server.basic2/build-svr-16.testcase b/test/build-server.basic2/build-svr-16.testcase new file mode 100644 index 0000000..4271351 --- /dev/null +++ b/test/build-server.basic2/build-svr-16.testcase @@ -0,0 +1,15 @@ +#PRE-EXEC +rm -rf buildsvr01 +mkdir buildsvr01 +cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 +../../build-svr register -n testserver3 -P bin/bin_0.0.0_linux.zip +#EXEC +../../build-svr register -n testserver3 -P bin/bin_0.0.0_linux.zip +#POST-EXEC +../../build-svr remove -n testserver3 +rm -rf buildsvr01 +#EXPECT +Info: Initializing job... +Info: Checking package version ... +Error: Version must be increased : +Error: Job is stopped by ERROR diff --git a/test/build-server.basic2/build-svr-17.testcase b/test/build-server.basic2/build-svr-17.testcase new file mode 100644 index 0000000..4f71ef8 --- /dev/null +++ b/test/build-server.basic2/build-svr-17.testcase @@ -0,0 +1,23 @@ +#PRE-EXEC +rm -rf buildsvr01 +mkdir buildsvr01 +cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 +#EXEC +../../build-svr add-os -n testserver3 -o linux +../../build-svr query -n testserver3 +#POST-EXEC +../../build-svr remove -n testserver3 +rm -rf buildsvr01 +#EXPECT +Target OS is added successfully! +* REMOTE SERVER(S) * + +* SUPPORTED OS * +* linux + +* DISTRIBUTION(S) * +* BASE + +* SYNC PACKAGE SERVER(S) * + +* PROJECT(S) * diff --git a/test/build-server.basic2/build-svr-18.testcase b/test/build-server.basic2/build-svr-18.testcase new file mode 100644 index 0000000..1412b07 --- /dev/null +++ b/test/build-server.basic2/build-svr-18.testcase @@ -0,0 +1,13 @@ +#PRE-EXEC +rm -rf buildsvr01 +mkdir buildsvr01 +cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 +#EXEC +../../build-svr add-os -n testserver3 -o linux +../../build-svr add-os -n testserver3 -o linux +#POST-EXEC +../../build-svr remove -n testserver3 +rm -rf buildsvr01 +#EXPECT +Target OS is added successfully! +Target OS already exists in list! diff --git a/test/build-server.basic2/build-svr-19.testcase b/test/build-server.basic2/build-svr-19.testcase new file mode 100644 index 0000000..6ec9675 --- /dev/null +++ b/test/build-server.basic2/build-svr-19.testcase @@ -0,0 +1,16 @@ +#PRE-EXEC +rm -rf buildsvr01 +mkdir buildsvr01 +cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 +../../build-svr add-os -n testserver3 -o linux +../../build-svr add-os -n testserver3 -o windows +#EXEC +../../build-svr add-prj -n testserver3 -N new_project -g new_git -b new_branch -o wrong_os_name +#POST-EXEC +../../build-svr remove -n testserver3 +rm -rf buildsvr01 +#EXPECT +Unsupported OS name "wrong_os_name" is used! +Check the following supported OS list: + * linux + * windows diff --git a/test/build-server.basic2/build-svr-20.testcase b/test/build-server.basic2/build-svr-20.testcase new file mode 100644 index 0000000..65f5b30 --- /dev/null +++ b/test/build-server.basic2/build-svr-20.testcase @@ -0,0 +1,21 @@ +#PRE-EXEC +rm -rf buildsvr01 +mkdir buildsvr01 +cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://ftpuser:ftpuser@172.21.111.124 +../../build-svr add-os -n testserver3 -o linux +mkdir -p bin +cp ../bin/bin_0.0.0_linux.zip bin/bin_0.0.0_wrongosname.zip +../../build-svr start -n testserver3 -p 2223 & +#EXEC +sleep 1 +../../build-svr register -n testserver3 -P bin/bin_0.0.0_wrongosname.zip +#POST-EXEC +../../build-svr stop -n testserver3 +sleep 1 +../../build-svr remove -n testserver3 +rm -rf buildsvr01 +rm -rf bin/bin/bin_0.0.0_wrongosname.zip +#EXPECT +Info: Initializing job... +Error: Unsupported OS "wrongosname" is used! +Error: Job is stopped by ERROR diff --git a/test/buildserver.testsuite b/test/build-server.basic2/testsuite similarity index 100% rename from test/buildserver.testsuite rename to test/build-server.basic2/testsuite diff --git a/test/build-server.multi_dist1/build-svr2-01.testcase b/test/build-server.multi_dist1/build-svr2-01.testcase new file mode 100644 index 0000000..fb3d879 --- /dev/null +++ b/test/build-server.multi_dist1/build-svr2-01.testcase @@ -0,0 +1,23 @@ +#PRE-EXEC +rm -rf buildsvr01 +rm -rf ~/.build_tools/build_server/testserver3 +mkdir buildsvr01 +cd buildsvr01;../../../build-svr create -n testserver3 -t ftp://ftpuser:ftpuser@127.0.0.1 +../../build-svr add-os -n testserver3 -o ubuntu-32 +../../build-svr add-os -n testserver3 -o ubuntu-64 +#EXEC +../../build-svr remove-os -n testserver3 -o ubuntu-64 +../../build-svr query -n testserver3 +#POST-EXEC +#EXPECT +Target OS is removed successfully! +* REMOTE SERVER(S) * + +* SUPPORTED OS * +* ubuntu-32 + +* DISTRIBUTION(S) * + +* SYNC PACKAGE SERVER(S) * + +* PROJECT(S) * diff --git a/test/build-svr2-02.testcase b/test/build-server.multi_dist1/build-svr2-02.testcase similarity index 59% rename from test/build-svr2-02.testcase rename to test/build-server.multi_dist1/build-svr2-02.testcase index ba2bdab..9298235 100644 --- a/test/build-svr2-02.testcase +++ b/test/build-server.multi_dist1/build-svr2-02.testcase @@ -1,7 +1,7 @@ #PRE-EXEC echo "no os" #EXEC -../build-svr remove-os -n testserver3 -o ubuntu-644 +../../build-svr remove-os -n testserver3 -o ubuntu-644 #POST-EXEC #EXPECT Target OS does not exist in list! diff --git a/test/build-svr2-03.testcase b/test/build-server.multi_dist1/build-svr2-03.testcase similarity index 59% rename from test/build-svr2-03.testcase rename to test/build-server.multi_dist1/build-svr2-03.testcase index 6337495..06f96c2 100644 --- a/test/build-svr2-03.testcase +++ b/test/build-server.multi_dist1/build-svr2-03.testcase @@ -1,7 +1,7 @@ #PRE-EXEC #EXEC -../build-svr add-dist -n testserver3 -D unstable -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -../build-svr query -n testserver3 +../../build-svr add-dist -n testserver3 -D unstable -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 +../../build-svr query -n testserver3 #POST-EXEC #EXPECT Distribution is added successfully! diff --git a/test/build-svr2-04.testcase b/test/build-server.multi_dist1/build-svr2-04.testcase similarity index 50% rename from test/build-svr2-04.testcase rename to test/build-server.multi_dist1/build-svr2-04.testcase index 9fdf060..c667dfc 100644 --- a/test/build-svr2-04.testcase +++ b/test/build-server.multi_dist1/build-svr2-04.testcase @@ -1,8 +1,8 @@ #PRE-EXEC -../build-svr add-dist -n testserver3 -D unstable2 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 +../../build-svr add-dist -n testserver3 -D unstable2 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 #EXEC -../build-svr remove-dist -n testserver3 -D unstable2 -../build-svr query -n testserver3 +../../build-svr remove-dist -n testserver3 -D unstable2 +../../build-svr query -n testserver3 #POST-EXEC #EXPECT Distribution is removed successfully! diff --git a/test/build-svr2-05.testcase b/test/build-server.multi_dist1/build-svr2-05.testcase similarity index 55% rename from test/build-svr2-05.testcase rename to test/build-server.multi_dist1/build-svr2-05.testcase index 5a86502..b08491d 100644 --- a/test/build-svr2-05.testcase +++ b/test/build-server.multi_dist1/build-svr2-05.testcase @@ -1,6 +1,6 @@ #PRE-EXEC #EXEC -../build-svr remove-dist -n testserver3 -D unstable22 +../../build-svr remove-dist -n testserver3 -D unstable22 #POST-EXEC #EXPECT Distribution does not exist in list! diff --git a/test/build-svr2-06.testcase b/test/build-server.multi_dist1/build-svr2-06.testcase similarity index 62% rename from test/build-svr2-06.testcase rename to test/build-server.multi_dist1/build-svr2-06.testcase index 5a9af60..685d52a 100644 --- a/test/build-svr2-06.testcase +++ b/test/build-server.multi_dist1/build-svr2-06.testcase @@ -1,14 +1,14 @@ #PRE-EXEC #EXEC -../build-svr add-sync -n testserver3 -u http://xxx -../build-svr query -n testserver3 -../build-svr add-sync -n testserver3 -D unstable -u http://yyy -../build-svr query -n testserver3 -../build-svr remove-sync -n testserver3 -u http://yyy -../build-svr query -n testserver3 -../build-svr remove-sync -n testserver3 -D unstable testserver3 -u http://xxx -../build-svr query -n testserver3 -../build-svr remove-sync -n testserver3 -D unstable testserver3 -u http://xxxyyyy +../../build-svr add-sync -n testserver3 -u http://xxx +../../build-svr query -n testserver3 +../../build-svr add-sync -n testserver3 -D unstable -u http://yyy +../../build-svr query -n testserver3 +../../build-svr remove-sync -n testserver3 -u http://yyy +../../build-svr query -n testserver3 +../../build-svr remove-sync -n testserver3 -D unstable testserver3 -u http://xxx +../../build-svr query -n testserver3 +../../build-svr remove-sync -n testserver3 -D unstable testserver3 -u http://xxxyyyy #POST-EXEC #EXPECT Remote package server is added! diff --git a/test/build-svr2-07.testcase b/test/build-server.multi_dist1/build-svr2-07.testcase similarity index 52% rename from test/build-svr2-07.testcase rename to test/build-server.multi_dist1/build-svr2-07.testcase index 20d11d0..6afd8c9 100644 --- a/test/build-svr2-07.testcase +++ b/test/build-server.multi_dist1/build-svr2-07.testcase @@ -1,19 +1,19 @@ #PRE-EXEC -../build-svr add-dist -n testserver3 -D unstable2 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 +../../build-svr add-dist -n testserver3 -D unstable2 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 #EXEC -../build-svr add-prj -n testserver3 -N test1 -g test1_git -b test1_branch -../build-svr query -n testserver3 -../build-svr add-prj -n testserver3 -D unstable -N test2 -g test1_git -b test1_branch -../build-svr add-prj -n testserver3 -D unstable2 -N test1 -g test1_git -b test1_branch -../build-svr query -n testserver3 -../build-svr remove-prj -n testserver3 -N test1 -../build-svr query -n testserver3 -../build-svr remove-prj -n testserver3 -D unstable -N test2 -../build-svr remove-prj -n testserver3 -D unstable2 -N test1 -../build-svr query -n testserver3 -../build-svr remove-prj -n testserver3 -D unstable -N testxxx +../../build-svr add-prj -n testserver3 -N test1 -g test1_git -b test1_branch +../../build-svr query -n testserver3 +../../build-svr add-prj -n testserver3 -D unstable -N test2 -g test1_git -b test1_branch +../../build-svr add-prj -n testserver3 -D unstable2 -N test1 -g test1_git -b test1_branch +../../build-svr query -n testserver3 +../../build-svr remove-prj -n testserver3 -N test1 +../../build-svr query -n testserver3 +../../build-svr remove-prj -n testserver3 -D unstable -N test2 +../../build-svr remove-prj -n testserver3 -D unstable2 -N test1 +../../build-svr query -n testserver3 +../../build-svr remove-prj -n testserver3 -D unstable -N testxxx #POST-EXEC -../build-svr remove-dist -n testserver3 -D unstable2 +../../build-svr remove-dist -n testserver3 -D unstable2 #EXPECT Adding project succeeded! * REMOTE SERVER(S) * diff --git a/test/build-svr2-08.testcase b/test/build-server.multi_dist1/build-svr2-08.testcase similarity index 58% rename from test/build-svr2-08.testcase rename to test/build-server.multi_dist1/build-svr2-08.testcase index beda518..90ef0b4 100644 --- a/test/build-svr2-08.testcase +++ b/test/build-server.multi_dist1/build-svr2-08.testcase @@ -1,8 +1,8 @@ #PRE-EXEC #EXEC -../build-svr add-prj -n testserver3 -D unstable -N testbin -P bin -../build-svr query -n testserver3 -../build-svr remove-prj -n testserver3 -N testbin -D unstable +../../build-svr add-prj -n testserver3 -D unstable -N testbin -P bin +../../build-svr query -n testserver3 +../../build-svr remove-prj -n testserver3 -N testbin -D unstable #POST-EXEC #EXPECT Adding project succeeded! diff --git a/test/build-server.multi_dist1/testsuite b/test/build-server.multi_dist1/testsuite new file mode 100644 index 0000000..c1e8c24 --- /dev/null +++ b/test/build-server.multi_dist1/testsuite @@ -0,0 +1,8 @@ +build-svr2-01.testcase +build-svr2-02.testcase +build-svr2-03.testcase +build-svr2-04.testcase +build-svr2-05.testcase +build-svr2-06.testcase +build-svr2-07.testcase +build-svr2-08.testcase diff --git a/test/build-svr3-01.testcase b/test/build-server.multi_dist2/build-svr3-01.testcase similarity index 78% rename from test/build-svr3-01.testcase rename to test/build-server.multi_dist2/build-svr3-01.testcase index 5180f36..224c40a 100644 --- a/test/build-svr3-01.testcase +++ b/test/build-server.multi_dist2/build-svr3-01.testcase @@ -1,6 +1,6 @@ #PRE-EXEC #EXEC -../build-svr register -n testserver3 -D unstable -P bin/bin_0.0.0_ubuntu-32.zip +../../build-svr register -n testserver3 -D unstable -P bin/bin_0.0.0_ubuntu-32.zip #POST-EXEC #EXPECT Info: Initializing job... diff --git a/test/build-svr3-02.testcase b/test/build-server.multi_dist2/build-svr3-02.testcase similarity index 92% rename from test/build-svr3-02.testcase rename to test/build-server.multi_dist2/build-svr3-02.testcase index ecb15d4..b25a3de 100644 --- a/test/build-svr3-02.testcase +++ b/test/build-server.multi_dist2/build-svr3-02.testcase @@ -1,7 +1,7 @@ #PRE-EXEC #EXEC -../build-cli build -N testa -d 127.0.0.1:2223 -D unstable -../build-cli build -N testa -d 127.0.0.1:2223 -D unstable2 +../../build-cli build -N testa -d 127.0.0.1:2223 -D unstable +../../build-cli build -N testa -d 127.0.0.1:2223 -D unstable2 #POST-EXEC #EXPECT Info: Added new job diff --git a/test/build-svr3-03.testcase b/test/build-server.multi_dist2/build-svr3-03.testcase similarity index 73% rename from test/build-svr3-03.testcase rename to test/build-server.multi_dist2/build-svr3-03.testcase index 3c3d365..f4ed2ec 100644 --- a/test/build-svr3-03.testcase +++ b/test/build-server.multi_dist2/build-svr3-03.testcase @@ -1,6 +1,6 @@ #PRE-EXEC #EXEC -../build-cli register -d 127.0.0.1:2223 -P bin/bin_0.0.0_ubuntu-32.zip -D unstable2 -t ftp://ftpuser:ftpuser@127.0.0.1 +../../build-cli register -d 127.0.0.1:2223 -P bin/bin_0.0.0_ubuntu-32.zip -D unstable2 -t ftp://ftpuser:ftpuser@127.0.0.1 #POST-EXEC #EXPECT Info: Added new job diff --git a/test/build-svr3-04.testcase b/test/build-server.multi_dist2/build-svr3-04.testcase similarity index 91% rename from test/build-svr3-04.testcase rename to test/build-server.multi_dist2/build-svr3-04.testcase index d040f2d..fe29a83 100644 --- a/test/build-svr3-04.testcase +++ b/test/build-server.multi_dist2/build-svr3-04.testcase @@ -1,6 +1,6 @@ #PRE-EXEC #EXEC -../build-svr fullbuild -n testserver3 -D unstable2 +../../build-svr fullbuild -n testserver3 -D unstable2 #POST-EXEC #EXPECT Info: Initializing job... diff --git a/test/build-server.multi_dist2/buildsvr.init b/test/build-server.multi_dist2/buildsvr.init new file mode 100755 index 0000000..cdc9f6a --- /dev/null +++ b/test/build-server.multi_dist2/buildsvr.init @@ -0,0 +1,35 @@ +#!/bin/sh +rm -rf buildsvr01 +rm -rf git01 +rm -rf bin +rm -rf ~/.build_tools/build_server/testserver3 + +../../build-svr remove -n testserver3 +mkdir buildsvr01 +cd buildsvr01 +../../../build-svr create -n testserver3 -t ftp://ftpuser:ftpuser@127.0.0.1 +cd .. + +../../build-svr add-dist -n testserver3 -D unstable -u `pwd`/pkgsvr01/unstable -d 127.0.0.1:3333 +../../build-svr add-dist -n testserver3 -D unstable2 -u `pwd`/pkgsvr01/unstable2 -d 127.0.0.1:3333 +../../build-svr add-os -n testserver3 -o ubuntu-32 +../../build-svr add-prj -n testserver3 -N testa -g `pwd`/git01/a -b master +../../build-svr add-prj -n testserver3 -N testb -g `pwd`/git01/b -b master +../../build-svr add-prj -n testserver3 -N testa -D unstable2 -g `pwd`/git01/a -b master +../../build-svr add-prj -n testserver3 -N testb -D unstable2 -g `pwd`/git01/b -b master +../../build-svr add-prj -n testserver3 -N testbin -D unstable -P bin +../../build-svr add-prj -n testserver3 -N testbin -D unstable2 -P bin + +mkdir -p git01 +cp ../git01/*.tar.gz git01/ +cd git01 +rm -rf a +rm -rf b +tar xf a_v1.tar.gz +tar xf b_v1.tar.gz +cd .. + +mkdir -p bin +cp ../bin/* bin/ + +ruby -d ../../build-svr start -n testserver3 -p 2223 --CHILD diff --git a/test/build-server.multi_dist2/pkgsvr.init b/test/build-server.multi_dist2/pkgsvr.init new file mode 100755 index 0000000..37b4357 --- /dev/null +++ b/test/build-server.multi_dist2/pkgsvr.init @@ -0,0 +1,10 @@ +#!/bin/sh +rm -rf ~/.build_tools/pkg_server/pkgsvr01 +rm -rf `pwd`/pkgsvr01 +ruby -d ../../pkg-svr create -n pkgsvr01 -d unstable +ruby -d ../../pkg-svr add-dist -n pkgsvr01 -d unstable2 +ruby -d ../../pkg-svr add-os -n pkgsvr01 -d unstable -o ubuntu-32 +ruby -d ../../pkg-svr add-os -n pkgsvr01 -d unstable -o windows-32 +ruby -d ../../pkg-svr add-os -n pkgsvr01 -d unstable2 -o ubuntu-32 +ruby -d ../../pkg-svr add-os -n pkgsvr01 -d unstable2 -o windows-32 +ruby -d ../../pkg-svr start -n pkgsvr01 -p 3333 diff --git a/test/build-server.multi_dist2/testsuite b/test/build-server.multi_dist2/testsuite new file mode 100644 index 0000000..0b3f6f2 --- /dev/null +++ b/test/build-server.multi_dist2/testsuite @@ -0,0 +1,4 @@ +build-svr3-01.testcase +build-svr3-02.testcase +build-svr3-03.testcase +build-svr3-04.testcase diff --git a/test/build-svr-01.testcase b/test/build-svr-01.testcase deleted file mode 100644 index 30ba63f..0000000 --- a/test/build-svr-01.testcase +++ /dev/null @@ -1,11 +0,0 @@ -#PRE-EXEC -rm -rf ~/.build_tools/build_server/testserver3 -rm -rf buildsvr01 -mkdir buildsvr01 -#EXEC -cd buildsvr01; ../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://ftpuser:ftpuser@172.21.111.124 -#POST-EXEC -../build-svr remove -n testserver3 -rm -rf buildsvr01 -#EXPECT -Created new build server: "testserver3" diff --git a/test/build-svr-03.testcase b/test/build-svr-03.testcase deleted file mode 100644 index d2faee1..0000000 --- a/test/build-svr-03.testcase +++ /dev/null @@ -1,23 +0,0 @@ -#PRE-EXEC -rm -rf buildsvr01 -mkdir buildsvr01 -cd buildsvr01; ../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 -#EXEC -../build-svr add-svr -n testserver3 -d 127.0.0.1:2223 -../build-svr query -n testserver3 -#POST-EXEC -../build-svr remove -n testserver3 -rm -rf buildsvr01 -#EXPECT -Friend server is added successfully! -* REMOTE SERVER(S) * -* 127.0.0.1:2223 - -* SUPPORTED OS * - -* DISTRIBUTION(S) * -* BASE - -* SYNC PACKAGE SERVER(S) * - -* PROJECT(S) * diff --git a/test/build-svr-04.testcase b/test/build-svr-04.testcase deleted file mode 100644 index 34f11d8..0000000 --- a/test/build-svr-04.testcase +++ /dev/null @@ -1,12 +0,0 @@ -#PRE-EXEC -rm -rf ~/.build_tools/build_server/testserver3 -rm -rf buildsvr01 -mkdir buildsvr01 -cd buildsvr01; ../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 -#EXEC -echo "TEST_TIME=3" >> ~/.build_tools/build_server/testserver3/server.cfg -../build-svr start -n testserver3 -p 2223 -#POST-EXEC -../build-svr remove -n testserver3 -rm -rf buildsvr01 -#EXPECT diff --git a/test/build-svr-05.testcase b/test/build-svr-05.testcase deleted file mode 100644 index 634cb10..0000000 --- a/test/build-svr-05.testcase +++ /dev/null @@ -1,14 +0,0 @@ -#PRE-EXEC -mkdir buildsvr01 -rm -rf ~/.build_tools/build_server/testserver3 -cd buildsvr01; ../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 -../build-svr start -n testserver3 -p 2223 & -#EXEC -sleep 1 -../build-svr stop -n testserver3 -sleep 1 -#POST-EXEC -../build-svr remove -n testserver3 -rm -rf buildsvr01 -#EXPECT -Server will be down! diff --git a/test/build-svr-06.testcase b/test/build-svr-06.testcase deleted file mode 100644 index b0f302a..0000000 --- a/test/build-svr-06.testcase +++ /dev/null @@ -1,10 +0,0 @@ -#PRE-EXEC -mkdir buildsvr01 -cd buildsvr01; ../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 -#EXEC -../build-svr stop -n testserver3 -#POST-EXEC -../build-svr remove -n testserver3 -rm -rf buildsvr01 -#EXPECT -Server is not running! diff --git a/test/build-svr-07.testcase b/test/build-svr-07.testcase deleted file mode 100644 index 856e52b..0000000 --- a/test/build-svr-07.testcase +++ /dev/null @@ -1,9 +0,0 @@ -#PRE-EXEC -mkdir buildsvr01 -cd buildsvr01; ../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 -#EXEC -../build-svr remove -n testserver3 -#POST-EXEC -rm -rf buildsvr01 -#EXPECT -Removed the server diff --git a/test/build-svr-08.testcase b/test/build-svr-08.testcase deleted file mode 100644 index c18ffa2..0000000 --- a/test/build-svr-08.testcase +++ /dev/null @@ -1,12 +0,0 @@ -#PRE-EXEC -rm -rf ~/.build_tools/build_server/testserver3 -rm -rf buildsvr01 -mkdir buildsvr01 -cd buildsvr01; ../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 -#EXEC -cd buildsvr01; ../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 -#POST-EXEC -../build-svr remove -n testserver3 -rm -rf buildsvr01 -#EXPECT -Creating server failed. The server id is already exist diff --git a/test/build-svr-11.testcase b/test/build-svr-11.testcase deleted file mode 100644 index 1632086..0000000 --- a/test/build-svr-11.testcase +++ /dev/null @@ -1,12 +0,0 @@ -#PRE-EXEC -rm -rf buildsvr01 -mkdir buildsvr01 -cd buildsvr01; ../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 -../build-svr add-os -n testserver3 -o linux -#EXEC -../build-svr add-prj -n testserver3 -N testa -g test_git -b test_branch -#POST-EXEC -../build-svr remove -n testserver3 -rm -rf buildsvr01 -#EXPECT -Adding project succeeded! diff --git a/test/build-svr-12.testcase b/test/build-svr-12.testcase deleted file mode 100644 index 69e3cd5..0000000 --- a/test/build-svr-12.testcase +++ /dev/null @@ -1,6 +0,0 @@ -#PRE-EXEC -#EXEC -../build-svr add-prj -n testserverxxx -N testa -g test_git -b test_branch -#POST-EXEC -#EXPECT -does not exist! diff --git a/test/build-svr-13.testcase b/test/build-svr-13.testcase deleted file mode 100644 index d480c1d..0000000 --- a/test/build-svr-13.testcase +++ /dev/null @@ -1,9 +0,0 @@ -#PRE-EXEC -rm -rf buildsvr01 -mkdir buildsvr01 -cd buildsvr01; ../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 -#EXEC -../build-svr add-prj -n testserver3 -N testa -g test_git -b test_branch -w 1111 -#POST-EXEC -#EXPECT -Adding project succeeded! diff --git a/test/build-svr-14.testcase b/test/build-svr-14.testcase deleted file mode 100644 index ae0432f..0000000 --- a/test/build-svr-14.testcase +++ /dev/null @@ -1,12 +0,0 @@ -#PRE-EXEC -rm -rf buildsvr01 -mkdir buildsvr01 -cd buildsvr01; ../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 -../build-svr add-os -n testserver3 -o linux -#EXEC -ruby -d ../build-svr add-prj -n testserver3 -N testx -g test_git -b test_branch -o linux -#POST-EXEC -../build-svr remove -n testserver3 -rm -rf buildsvr01 -#EXPECT -Adding project succeeded! diff --git a/test/build-svr-16.testcase b/test/build-svr-16.testcase deleted file mode 100644 index d2ade40..0000000 --- a/test/build-svr-16.testcase +++ /dev/null @@ -1,15 +0,0 @@ -#PRE-EXEC -rm -rf buildsvr01 -mkdir buildsvr01 -cd buildsvr01; ../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 -../build-svr register -n testserver3 -P bin/bin_0.0.0_linux.zip -#EXEC -../build-svr register -n testserver3 -P bin/bin_0.0.0_linux.zip -#POST-EXEC -../build-svr remove -n testserver3 -rm -rf buildsvr01 -#EXPECT -Info: Initializing job... -Info: Checking package version ... -Error: Version must be increased : -Error: Job is stopped by ERROR diff --git a/test/build-svr-17.testcase b/test/build-svr-17.testcase deleted file mode 100644 index f1e8dd0..0000000 --- a/test/build-svr-17.testcase +++ /dev/null @@ -1,23 +0,0 @@ -#PRE-EXEC -rm -rf buildsvr01 -mkdir buildsvr01 -cd buildsvr01; ../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 -#EXEC -../build-svr add-os -n testserver3 -o linux -../build-svr query -n testserver3 -#POST-EXEC -../build-svr remove -n testserver3 -rm -rf buildsvr01 -#EXPECT -Target OS is added successfully! -* REMOTE SERVER(S) * - -* SUPPORTED OS * -* linux - -* DISTRIBUTION(S) * -* BASE - -* SYNC PACKAGE SERVER(S) * - -* PROJECT(S) * diff --git a/test/build-svr-18.testcase b/test/build-svr-18.testcase deleted file mode 100644 index 21beedd..0000000 --- a/test/build-svr-18.testcase +++ /dev/null @@ -1,13 +0,0 @@ -#PRE-EXEC -rm -rf buildsvr01 -mkdir buildsvr01 -cd buildsvr01; ../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 -#EXEC -../build-svr add-os -n testserver3 -o linux -../build-svr add-os -n testserver3 -o linux -#POST-EXEC -../build-svr remove -n testserver3 -rm -rf buildsvr01 -#EXPECT -Target OS is added successfully! -Target OS already exists in list! diff --git a/test/build-svr-19.testcase b/test/build-svr-19.testcase deleted file mode 100644 index 3146917..0000000 --- a/test/build-svr-19.testcase +++ /dev/null @@ -1,16 +0,0 @@ -#PRE-EXEC -rm -rf buildsvr01 -mkdir buildsvr01 -cd buildsvr01; ../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 -../build-svr add-os -n testserver3 -o linux -../build-svr add-os -n testserver3 -o windows -#EXEC -../build-svr add-prj -n testserver3 -N new_project -g new_git -b new_branch -o wrong_os_name -#POST-EXEC -../build-svr remove -n testserver3 -rm -rf buildsvr01 -#EXPECT -Unsupported OS name "wrong_os_name" is used! -Check the following supported OS list: - * linux - * windows diff --git a/test/build-svr-20.testcase b/test/build-svr-20.testcase deleted file mode 100644 index a0fa45d..0000000 --- a/test/build-svr-20.testcase +++ /dev/null @@ -1,20 +0,0 @@ -#PRE-EXEC -rm -rf buildsvr01 -mkdir buildsvr01 -cd buildsvr01; ../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://ftpuser:ftpuser@172.21.111.124 -../build-svr add-os -n testserver3 -o linux -cp bin/bin_0.0.0_linux.zip bin/bin_0.0.0_wrongosname.zip -../build-svr start -n testserver3 -p 2223 & -#EXEC -sleep 1 -../build-svr register -n testserver3 -P bin/bin_0.0.0_wrongosname.zip -#POST-EXEC -../build-svr stop -n testserver3 -sleep 1 -../build-svr remove -n testserver3 -rm -rf buildsvr01 -rm -rf bin/bin/bin_0.0.0_wrongosname.zip -#EXPECT -Info: Initializing job... -Error: Unsupported OS "wrongosname" is used! -Error: Job is stopped by ERROR diff --git a/test/build-svr2-01.testcase b/test/build-svr2-01.testcase deleted file mode 100644 index 21a375c..0000000 --- a/test/build-svr2-01.testcase +++ /dev/null @@ -1,18 +0,0 @@ -#PRE-EXEC -../build-svr add-os -n testserver3 -o ubuntu-64 -#EXEC -../build-svr remove-os -n testserver3 -o ubuntu-64 -../build-svr query -n testserver3 -#POST-EXEC -#EXPECT -Target OS is removed successfully! -* REMOTE SERVER(S) * - -* SUPPORTED OS * -* ubuntu-32 - -* DISTRIBUTION(S) * - -* SYNC PACKAGE SERVER(S) * - -* PROJECT(S) * diff --git a/test/buildsvr.init b/test/buildsvr.init deleted file mode 100755 index e8964ab..0000000 --- a/test/buildsvr.init +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -rm -rf buildsvr01 -rm -rf ~/.build_tools/build_server/testserver3 -mkdir buildsvr01 -cd buildsvr01 -../../build-svr remove -n testserver3 -../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://ftpuser:ftpuser@127.0.0.1 -../../build-svr add-svr -n testserver3 -d 127.0.0.1:2224 -../../build-svr add-svr -n testserver3 -u `pwd`/../pkgsvr02/unstable -cd .. -cd git01 -rm -rf a -rm -rf a1 -rm -rf b -rm -rf c -rm -rf d -tar xvf a_v1.tar.gz -tar xvf b_v1.tar.gz -tar xvf c_v1.tar.gz -tar xvf d_v0.tar.gz -tar xvf a1_v1.tar.gz -cd .. -../build-svr add-os -n testserver3 -o ubuntu-32 -../build-svr add-os -n testserver3 -o windows-32 -../build-svr add-prj -n testserver3 -N testa -g `pwd`/git01/a -b master -../build-svr add-prj -n testserver3 -N testb -g `pwd`/git01/b -b master -../build-svr add-prj -n testserver3 -N testc -g `pwd`/git01/c -b master -w 1111 -../build-svr add-prj -n testserver3 -N testd -g `pwd`/git01/d -b master -o ubuntu-32 -../build-svr add-prj -n testserver3 -N teste -P bin -../build-svr add-prj -n testserver3 -N testa1 -g `pwd`/git01/a1 -b master -../pkg-svr register -n pkgsvr01 -d unstable -P bin/bin_0.0.0_ubuntu-32.zip -ruby -d ../build-svr start -n testserver3 -p 2223 --CHILD diff --git a/test/buildsvr3.init b/test/buildsvr3.init deleted file mode 100755 index fc50c3a..0000000 --- a/test/buildsvr3.init +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -rm -rf buildsvr01 -rm -rf ~/.build_tools/build_server/testserver3 -mkdir buildsvr01 -cd buildsvr01 -../../build-svr create -n testserver3 -t ftp://ftpuser:ftpuser@127.0.0.1 -../../build-svr add-os -n testserver3 -o ubuntu-32 diff --git a/test/buildsvr4.init b/test/buildsvr4.init deleted file mode 100755 index a3f7b2c..0000000 --- a/test/buildsvr4.init +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -rm -rf buildsvr01 -rm -rf ~/.build_tools/build_server/testserver3 -mkdir buildsvr01 -../build-svr remove -n testserver3 -cd buildsvr01 -../../build-svr create -n testserver3 -t ftp://ftpuser:ftpuser@127.0.0.1 -cd .. -cd git01 -rm -rf a -rm -rf b -tar xf a_v1.tar.gz -tar xf b_v1.tar.gz -cd .. -../build-svr add-dist -n testserver3 -D unstable -u `pwd`/pkgsvr01/unstable -d 127.0.0.1:3333 -../build-svr add-dist -n testserver3 -D unstable2 -u `pwd`/pkgsvr01/unstable2 -d 127.0.0.1:3333 -../build-svr add-os -n testserver3 -o ubuntu-32 -../build-svr add-prj -n testserver3 -N testa -g `pwd`/git01/a -b master -../build-svr add-prj -n testserver3 -N testb -g `pwd`/git01/b -b master -../build-svr add-prj -n testserver3 -N testa -D unstable2 -g `pwd`/git01/a -b master -../build-svr add-prj -n testserver3 -N testb -D unstable2 -g `pwd`/git01/b -b master -../build-svr add-prj -n testserver3 -N testbin -D unstable -P bin -../build-svr add-prj -n testserver3 -N testbin -D unstable2 -P bin -ruby -d ../build-svr start -n testserver3 -p 2223 --CHILD diff --git a/test/pkgsvr.init b/test/pkgsvr.init deleted file mode 100755 index 96b4f3f..0000000 --- a/test/pkgsvr.init +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -rm -rf ~/.build_tools/pkg_server/pkgsvr01 -rm -rf `pwd`/pkgsvr01 -ruby -d ../pkg-svr create -n pkgsvr01 -d unstable -ruby -d ../pkg-svr add-os -n pkgsvr01 -d unstable -o ubuntu-32 -ruby -d ../pkg-svr add-os -n pkgsvr01 -d unstable -o windows-32 -ruby -d ../pkg-svr start -n pkgsvr01 -p 3333 diff --git a/test/pkgsvr4.init b/test/pkgsvr4.init deleted file mode 100755 index fbb6e49..0000000 --- a/test/pkgsvr4.init +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -rm -rf ~/.build_tools/pkg_server/pkgsvr01 -rm -rf `pwd`/pkgsvr01 -ruby -d ../pkg-svr create -n pkgsvr01 -d unstable -ruby -d ../pkg-svr add-dist -n pkgsvr01 -d unstable2 -ruby -d ../pkg-svr add-os -n pkgsvr01 -d unstable -o ubuntu-32 -ruby -d ../pkg-svr add-os -n pkgsvr01 -d unstable -o windows-32 -ruby -d ../pkg-svr add-os -n pkgsvr01 -d unstable2 -o ubuntu-32 -ruby -d ../pkg-svr add-os -n pkgsvr01 -d unstable2 -o windows-32 -ruby -d ../pkg-svr start -n pkgsvr01 -p 3333 -- 2.34.1