From 60133aad41dc4e62718a9e9d87fb8bdc57ad26f7 Mon Sep 17 00:00:00 2001
From: Jun Wang <junbill.wang@samsung.com>
Date: Sat, 14 Oct 2017 17:03:56 +0800
Subject: [PATCH] Fix bugs in test cases: 1.Add default  repo
 [test_build_upstream_config_file.case] 2.Clean the BUILD root before gbs
 build[test_build_tizen2.4.case] 3.Using new log file
 [test_build_tizen2.4_Epoch.case] 4.Add proxy for them

Change-Id: If29228dbbc3c052a509cde094cea0d0c1f7183ce
---
 cases/build/test_build_tizen2.4.case             | 15 +++++++++------
 cases/build/test_build_tizen2.4_Epoch.case       | 15 +++++++++------
 cases/build/test_build_upstream_config_file.case |  9 ++++++---
 fixtures/conf/upstream_tag.cfg                   |  8 ++++++++
 4 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/cases/build/test_build_tizen2.4.case b/cases/build/test_build_tizen2.4.case
index 4f8a232..843f3b3 100644
--- a/cases/build/test_build_tizen2.4.case
+++ b/cases/build/test_build_tizen2.4.case
@@ -8,14 +8,17 @@
   <steps><![CDATA[
 
   ./create_proj fake.spec
-  sudo /bin/rm -rf ~/GBS-ROOT/local/repos
+  export http_proxy="http://10.112.1.184:8080/"
+  export no_proxy="localhost, 10.113.136.109"
+
+  sudo /bin/rm -rf ~/GBS-ROOT/*
 
   #First run
-  gbs -c tizen2.4.cfg build fake  -A armv7l 
- 
+  gbs -c tizen2.4.cfg build fake  -A armv7l
+
   #second run using old chroot evn
-  sudo /bin/rm -rf ~/GBS-ROOT/local/repos 
-  gbs -c tizen2.4.cfg build fake  -A armv7l  
-  
+  sudo /bin/rm -rf ~/GBS-ROOT/local/repos
+  gbs -c tizen2.4.cfg build fake  -A armv7l
+
 ]]></steps>
 </testcase>
diff --git a/cases/build/test_build_tizen2.4_Epoch.case b/cases/build/test_build_tizen2.4_Epoch.case
index 2e6535f..a4a442a 100644
--- a/cases/build/test_build_tizen2.4_Epoch.case
+++ b/cases/build/test_build_tizen2.4_Epoch.case
@@ -8,19 +8,22 @@
   <steps><![CDATA[
 
   ./create_proj fake.spec
+  export http_proxy="http://10.112.1.184:8080/"
+  export no_proxy="localhost, 10.113.136.109"
+
   sudo /bin/rm -rf ~/GBS-ROOT/*
 
   #First run
   gbs -c tizen2.4.cfg build fake  -A armv7l 2>&1 | tee log
   #Check for the presence of 'downloading' fields (must have in this step)
-  test -n "`grep "downloading" log`" 
- 
+  test -n "`grep "downloading" log`"
+
   #second run using old chroot evn
-  sudo /bin/rm -rf ~/GBS-ROOT/local/repos 
-  gbs -c tizen2.4.cfg build fake  -A armv7l 2>&1 | tee log
+  sudo /bin/rm -rf ~/GBS-ROOT/local/repos
+  gbs -c tizen2.4.cfg build fake  -A armv7l 2>&1 | tee log2
 
   #Check for the presence of 'downloading' fields (no exist)
-  test -z "`grep "downloading" log`"
-  
+  test -z "`grep "downloading" log2`"
+
 ]]></steps>
 </testcase>
diff --git a/cases/build/test_build_upstream_config_file.case b/cases/build/test_build_upstream_config_file.case
index 6884e40..0690c1d 100644
--- a/cases/build/test_build_upstream_config_file.case
+++ b/cases/build/test_build_upstream_config_file.case
@@ -7,14 +7,17 @@
   </fixtures>
   <steps><![CDATA[
 
-  ./create_proj fake.spec --tizen 
+  ./create_proj fake.spec --tizen
+  export http_proxy="http://10.112.1.184:8080/"
+  export no_proxy="localhost, 10.113.136.109"
+
   mv upstream_tag.cfg fake/.gbs.conf
   cd fake
   git tag -a "v1.0" -m "v1.0"
 
   sudo /bin/rm -rf ~/GBS-ROOT/local/
 
-  gbs build -A armv7l  
-  
+  gbs build -A armv7l
+ 
 ]]></steps>
 </testcase>
diff --git a/fixtures/conf/upstream_tag.cfg b/fixtures/conf/upstream_tag.cfg
index 2290232..9ea3e1b 100644
--- a/fixtures/conf/upstream_tag.cfg
+++ b/fixtures/conf/upstream_tag.cfg
@@ -1,3 +1,11 @@
 [general]
 upstream_branch = upstream
 upstream_tag = v${upstreamversion}
+profile = profile.2.4
+
+[profile.2.4]
+repos = repo.base.2.4
+[repo.base.2.4]
+url = http://download.tizen.org/snapshots/2.4-base/common/latest/repos/standard/packages/
+[repo.2.4]
+url = http://download.tizen.org/snapshots/2.4-mobile/common/latest/repos/target-TM1/packages/
-- 
2.7.4