summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Wittig <max.wittig@siemens.com>2018-11-03 21:49:38 +0100
committerGitHub <noreply@github.com>2018-11-03 21:49:38 +0100
commit742243f4f43042d4b561e3875dc38e560bb71624 (patch)
treedc9a1ebe94634a63d839e19fa08a5cf20b9aaed1
parentfcce7a316968a9aea7aa504730cea1734c2f897a (diff)
parent2c6c929f78dfda92d5ae93235bb9065d289a68cc (diff)
downloadgitlab-742243f4f43042d4b561e3875dc38e560bb71624.tar.gz
Merge pull request #624 from python-gitlab/update/docker-image
Use the pythongitlab/test-python-gitlab docker image for tests
-rwxr-xr-xtools/build_test_env.sh2
-rw-r--r--tools/python_test_v4.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/build_test_env.sh b/tools/build_test_env.sh
index ebfb80a..3185f72 100755
--- a/tools/build_test_env.sh
+++ b/tools/build_test_env.sh
@@ -77,7 +77,7 @@ cleanup() {
}
try docker run --name gitlab-test --detach --publish 8080:80 \
- --publish 2222:22 gpocentek/test-python-gitlab:latest >/dev/null
+ --publish 2222:22 pythongitlab/test-python-gitlab:latest >/dev/null
LOGIN='root'
PASSWORD='5iveL!fe'
diff --git a/tools/python_test_v4.py b/tools/python_test_v4.py
index 79a78bc..133aeb3 100644
--- a/tools/python_test_v4.py
+++ b/tools/python_test_v4.py
@@ -390,7 +390,7 @@ data = {
]
}
admin_project.commits.create(data)
-assert('---' in admin_project.commits.list()[0].diff()[0]['diff'])
+assert('@@' in admin_project.commits.list()[0].diff()[0]['diff'])
# commit status
commit = admin_project.commits.list()[0]