Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 3b523f4

Browse filesBrowse files
committed
test: minor test fixes
1 parent 8ff8af0 commit 3b523f4
Copy full SHA for 3b523f4

File tree

Expand file treeCollapse file tree

3 files changed

+12
-11
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

3 files changed

+12
-11
lines changed
Open diff view settings
Collapse file

‎.travis.yml‎

Copy file name to clipboardExpand all lines: .travis.yml
+7-7Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@ sudo: required
22
services:
33
- docker
44
language: python
5-
env:
6-
#- TOX_ENV=py_func_v4
7-
- TOX_ENV=cli_func_v4
8-
install:
9-
- pip install tox
10-
script:
11-
- tox -e $TOX_ENV
125

136
git:
147
depth: false
@@ -39,6 +32,13 @@ jobs:
3932
script:
4033
- pip3 install tox
4134
- tox -e cli_func_v4
35+
#- stage: test
36+
# name: py_func_v4
37+
# dist: bionic
38+
# python: 3.7
39+
# script:
40+
# - pip3 install tox
41+
# - tox -e py_func_v4
4242
- stage: test
4343
name: docs
4444
dist: bionic
Collapse file

‎tools/build_test_env.sh‎

Copy file name to clipboardExpand all lines: tools/build_test_env.sh
+4-3Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ cleanup() {
7676
trap 'exit 1' HUP INT TERM
7777
}
7878

79+
try docker pull registry.gitlab.com/python-gitlab/python-gitlab:test >/dev/null
7980
try docker run --name gitlab-test --detach --publish 8080:80 \
8081
--publish 2222:22 registry.gitlab.com/python-gitlab/python-gitlab:test >/dev/null
8182

@@ -99,7 +100,7 @@ if [ -z "$NOVENV" ]; then
99100
. "$VENV"/bin/activate || fatal "failed to activate Python virtual environment"
100101

101102
log "Installing dependencies into virtualenv..."
102-
try pip install -rrequirements.txt
103+
try pip install -r requirements.txt
103104

104105
log "Installing into virtualenv..."
105106
try pip install -e .
@@ -126,7 +127,7 @@ TOKEN=$($(dirname $0)/generate_token.py)
126127
cat > $CONFIG << EOF
127128
[global]
128129
default = local
129-
timeout = 10
130+
timeout = 30
130131
131132
[local]
132133
url = http://localhost:8080
@@ -138,6 +139,6 @@ log "Config file content ($CONFIG):"
138139
log <$CONFIG
139140

140141
log "Pausing to give GitLab some time to finish starting up..."
141-
sleep 60
142+
sleep 200
142143

143144
log "Test environment initialized."
Collapse file

‎tox.ini‎

Copy file name to clipboardExpand all lines: tox.ini
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tox]
22
minversion = 1.6
33
skipsdist = True
4-
envlist = py36,py35,py34,py27,pep8,black
4+
envlist = py38,py37,py36,py35,py34,py27,pep8,black
55

66
[testenv]
77
setenv = VIRTUAL_ENV={envdir}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.