Merge pull request #624 from python-gitlab/update/docker-image

max-wittig · web-flow · commit 742243f4f430 · 2018-11-03T21:49:38.000+01:00
Use the pythongitlab/test-python-gitlab docker image for tests
diff --git 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
@@ -390,7 +390,7 @@
     ]
 }
 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]

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ cleanup() {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`try docker run --name gitlab-test --detach --publish 8080:80 \`
`80`		`- --publish 2222:22 gpocentek/test-python-gitlab:latest >/dev/null`
	`80`	`+ --publish 2222:22 pythongitlab/test-python-gitlab:latest >/dev/null`
`81`	`81`
`82`	`82`	`LOGIN='root'`
`83`	`83`	`PASSWORD='5iveL!fe'`
Original file line number	Diff line number	Diff line change
`@@ -390,7 +390,7 @@`
`390`	`390`	`]`
`391`	`391`	`}`
`392`	`392`	`admin_project.commits.create(data)`
`393`		`-assert('---' in admin_project.commits.list()[0].diff()[0]['diff'])`
	`393`	`+assert('@@' in admin_project.commits.list()[0].diff()[0]['diff'])`
`394`	`394`
`395`	`395`	`# commit status`
`396`	`396`	`commit = admin_project.commits.list()[0]`