From af673530221d3db8fbc0785b88eff7a62af8d5aa Mon Sep 17 00:00:00 2001
From: geekerzp <geekerzp@gmail.com>
Date: Tue, 14 Jul 2015 15:38:23 +0800
Subject: [PATCH] Update integration test of python client

---
 samples/client/petstore/python/Makefile    |  7 ++++---
 samples/client/petstore/python/pom.xml     | 15 ---------------
 samples/client/petstore/python/test-all.sh |  4 ++--
 samples/client/petstore/python/test.sh     |  4 ++--
 4 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/samples/client/petstore/python/Makefile b/samples/client/petstore/python/Makefile
index b1c318aadb7f..0f65e0c6ac34 100644
--- a/samples/client/petstore/python/Makefile
+++ b/samples/client/petstore/python/Makefile
@@ -1,4 +1,4 @@
- #!/bin/sh
+ #!/bin/bash
 
 REQUIREMENTS_FILE=dev-requirements.txt
 REQUIREMENTS_OUT=dev-requirements.txt.log
@@ -8,13 +8,14 @@ VENV=.venv
 clean:
 		rm -rf $(REQUIREMENTS_OUT)
 		rm -rf $(SETUP_OUT)
+		rm -rf $(VENV)
 		rm -rf .tox
 		rm -rf .coverage
 		find . -name "*.py[oc]" -delete
 		find . -name "__pycache__" -delete
 
 test: clean 
-		sh ./test.sh
+		bash ./test.sh
 
 test-all: clean 
-		sh ./test-all.sh
+		bash ./test-all.sh
diff --git a/samples/client/petstore/python/pom.xml b/samples/client/petstore/python/pom.xml
index 1eca98baf76b..147938617d2c 100644
--- a/samples/client/petstore/python/pom.xml
+++ b/samples/client/petstore/python/pom.xml
@@ -26,21 +26,6 @@
                 <artifactId>exec-maven-plugin</artifactId>
                 <version>1.2.1</version>
                 <executions>
-                    <execution>
-                        <id>pip-install</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>pip</executable>
-                            <arguments>
-                                <argument>install</argument>
-                                <argument>--user</argument>
-                                <argument>virtualenv</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
                     <execution>
                         <id>nose-test</id>
                         <phase>integration-test</phase>
diff --git a/samples/client/petstore/python/test-all.sh b/samples/client/petstore/python/test-all.sh
index e6c2a9ff19cc..03c16abd4ae6 100755
--- a/samples/client/petstore/python/test-all.sh
+++ b/samples/client/petstore/python/test-all.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 REQUIREMENTS_FILE=dev-requirements.txt
 REQUIREMENTS_OUT=dev-requirements.txt.log
@@ -8,7 +8,7 @@ DEACTIVE=false
 
 ### set virtualenv
 if [ -z "$VIRTUAL_ENV" ]; then
-		virtualenv $VENV --no-site-packages
+		virtualenv $VENV --no-site-packages --always-copy
 		source $VENV/bin/activate
     DEACTIVE=true
 fi
diff --git a/samples/client/petstore/python/test.sh b/samples/client/petstore/python/test.sh
index 580cd7d67e9b..c6889895950f 100755
--- a/samples/client/petstore/python/test.sh
+++ b/samples/client/petstore/python/test.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 REQUIREMENTS_FILE=dev-requirements.txt
 REQUIREMENTS_OUT=dev-requirements.txt.log
@@ -8,7 +8,7 @@ DEACTIVE=false
 
 ### set virtualenv
 if [ -z "$VIRTUAL_ENV" ]; then
-		virtualenv $VENV --no-site-packages
+		virtualenv $VENV --no-site-packages --always-copy
 		source $VENV/bin/activate
     DEACTIVE=true
 fi