From 83bb15ed18d3027de7901e0b2de032a0bc9348ae Mon Sep 17 00:00:00 2001
From: Frost Ming <mianghong@gmail.com>
Date: Fri, 30 Oct 2020 13:05:07 +0800
Subject: [PATCH] Upgrade virtualenv version

---
 .azure-pipelines/steps/run-tests-linux.yml   | 2 +-
 .azure-pipelines/steps/run-tests-windows.yml | 2 +-
 .github/workflows/ci.yaml                    | 2 +-
 Pipfile.lock                                 | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.azure-pipelines/steps/run-tests-linux.yml b/.azure-pipelines/steps/run-tests-linux.yml
index dbb13f94..efeda02a 100644
--- a/.azure-pipelines/steps/run-tests-linux.yml
+++ b/.azure-pipelines/steps/run-tests-linux.yml
@@ -21,7 +21,7 @@ steps:
     # Fix Git SSL errors
     echo "Using pipenv python version: $(PIPENV_DEFAULT_PYTHON_VERSION)"
     git submodule sync && git submodule update --init --recursive
-    pipenv run pytest -n 4 --junitxml=junit/test-results.xml
+    pipenv run pytest -n 4 --junitxml=junit/test-results.xml --timeout=300 tests
   displayName: Run integration tests
   env:
     PYTHONWARNINGS: ignore:DEPRECATION
diff --git a/.azure-pipelines/steps/run-tests-windows.yml b/.azure-pipelines/steps/run-tests-windows.yml
index 2378d5ee..d8e31b30 100644
--- a/.azure-pipelines/steps/run-tests-windows.yml
+++ b/.azure-pipelines/steps/run-tests-windows.yml
@@ -46,7 +46,7 @@ steps:
   - script: |
       git submodule sync
       git submodule update --init --recursive
-      pipenv run pytest -ra -n 4 --junit-xml=junit/test-results.xml --fulltrace --timeout=60 tests/
+      pipenv run pytest -ra -n 4 --junit-xml=junit/test-results.xml --timeout=300 tests/
     failOnStderr: false
     displayName: Run integration tests
     env:
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index fe3de6d9..94d8088a 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -80,4 +80,4 @@ jobs:
         PYTHONIOENCODING: 'utf-8'
         GIT_SSH_COMMAND: ssh -o StrictHostKeyChecking=accept-new -o CheckHostIP=no
       run: |
-        pipenv run pytest -ra -n 4 --fulltrace --timeout=60 tests
+        pipenv run pytest -ra -n 4 --timeout=300 tests
diff --git a/Pipfile.lock b/Pipfile.lock
index fb8d626f..cffc42f3 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1013,11 +1013,11 @@
         },
         "virtualenv": {
             "hashes": [
-                "sha256:43add625c53c596d38f971a465553f6318decc39d98512bc100fa1b1e839c8dc",
-                "sha256:e0305af10299a7fb0d69393d8f04cb2965dda9351140d11ac8db4e5e3970451b"
+                "sha256:b0011228208944ce71052987437d3843e05690b2f23d1c7da4263fde104c97a2",
+                "sha256:b8d6110f493af256a40d65e29846c69340a947669eec8ce784fcf3dd3af28380"
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==20.0.31"
+            "version": "==20.1.0"
         },
         "virtualenv-clone": {
             "hashes": [