diff options
| author | Thomas Boerger <thomas@webhippie.de> | 2017-09-10 03:54:11 +0200 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2017-09-10 09:54:11 +0800 |
| commit | fd85e25f5f48823c4e65f3bd23662fd26d1398b3 (patch) | |
| tree | 3b0be1cd4abd0d5581a1ecffac1a24a85938be7c | |
| parent | 4b8fef143ea399d6bf5c23adda7fb0b191d4ded2 (diff) | |
| download | gitea-fd85e25f5f48823c4e65f3bd23662fd26d1398b3.tar.gz gitea-fd85e25f5f48823c4e65f3bd23662fd26d1398b3.zip | |
Hotfix for integration testing (#2473)
* Hotfix for integration testing
* Comment sqlite tests because of database locking issues
| -rw-r--r-- | .drone.yml | 23 | ||||
| -rw-r--r-- | integrations/mysql.ini | 2 | ||||
| -rw-r--r-- | integrations/pgsql.ini | 2 | ||||
| -rw-r--r-- | integrations/sqlite.ini | 5 |
4 files changed, 14 insertions, 18 deletions
diff --git a/.drone.yml b/.drone.yml index e852007172..7bb3e9e13b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -39,17 +39,18 @@ pipeline: when: event: [ push, tag, pull_request ] - test-sqlite: - image: webhippie/golang:edge - pull: true - group: test - environment: - TAGS: bindata - GOPATH: /srv/app - commands: - - make test-sqlite - when: - event: [ push, tag, pull_request ] + # Commented until db locking have been resolved! + # test-sqlite: + # image: webhippie/golang:edge + # pull: true + # group: test + # environment: + # TAGS: bindata + # GOPATH: /srv/app + # commands: + # - make test-sqlite + # when: + # event: [ push, tag, pull_request ] test-mysql: image: webhippie/golang:edge diff --git a/integrations/mysql.ini b/integrations/mysql.ini index 2818e2bf36..82acc2443a 100644 --- a/integrations/mysql.ini +++ b/integrations/mysql.ini @@ -3,7 +3,7 @@ RUN_MODE = prod [database] DB_TYPE = mysql -HOST = 127.0.0.1:3306 +HOST = mysql:3306 NAME = testgitea USER = root PASSWD = diff --git a/integrations/pgsql.ini b/integrations/pgsql.ini index 2deaa19638..fe979a6538 100644 --- a/integrations/pgsql.ini +++ b/integrations/pgsql.ini @@ -3,7 +3,7 @@ RUN_MODE = prod [database] DB_TYPE = postgres -HOST = 127.0.0.1:5432 +HOST = pgsql:5432 NAME = testgitea USER = postgres PASSWD = postgres diff --git a/integrations/sqlite.ini b/integrations/sqlite.ini index c771507a76..799a44b472 100644 --- a/integrations/sqlite.ini +++ b/integrations/sqlite.ini @@ -3,11 +3,6 @@ RUN_MODE = prod [database] DB_TYPE = sqlite3 -HOST = 127.0.0.1:3306 -NAME = testgitea -USER = gitea -PASSWD = -SSL_MODE = disable PATH = :memory: [repository] |