Skip to content

Commit

Permalink
Update tests for Travis updates
Browse files Browse the repository at this point in the history
Use postgresql-9.1-postgis-2.0
Use native Python and PIP
Update tests
Rm Travis backports
  • Loading branch information
sbrunner committed Jun 20, 2014
1 parent 8173f1d commit c0c6625
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 18 deletions.
15 changes: 6 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
language: python

python:
- 2.6
- 2.7

env:
global:
- BERKELEYDB_LIBDIR=/usr/lib/x86_64-linux-gnu BERKELEYDB_INCDIR=/usr/include
Expand All @@ -19,10 +13,13 @@ before_install:
- chmod 644 ~/.bashrc
- echo "PATH=${PATH}" > ~/.bashrc

- sudo rm -f /etc/apt/sources.list.d/pgdg-source.list
- sudo rm -rf /usr/local
- echo 'yes' | sudo add-apt-repository ppa:stephane-brunner/precise
- echo 'yes' | sudo add-apt-repository ppa:mapnik/v2.2.0
- sudo apt-get update
- sudo apt-get install -y libmapnik-dev python-mapnik apache2 cgi-mapserver deploy libdb-dev optipng
- sudo apt-get install -y --force-yes libmapnik-dev python-mapnik apache2 cgi-mapserver deploy libdb-dev optipng postgresql-9.1-postgis-2.0=2.0.3-2~precise4 postgis=2.0.3-2~precise4 python python-pip

- sudo -u postgres tilecloud_chain/tests/create_test_data.sh
- sudo cp tilecloud_chain/tests/apache.conf /etc/apache2/sites-enabled/apache.conf
- sudo apache2ctl graceful
Expand All @@ -33,7 +30,7 @@ before_install:
- sudo chmod g+s,o+w /tmp/tests

install:
- pip install -U mapnik2==2.2.0
- sudo pip install -U mapnik2==2.2.0
- python bootstrap.py -v 1.7.1
- ./buildout/bin/buildout

Expand All @@ -43,7 +40,7 @@ script:

after_success:
# Report coverage results to coveralls.io
- pip install coveralls
- sudo pip install coveralls
- coveralls

notifications:
Expand Down
18 changes: 9 additions & 9 deletions tilecloud_chain/tests/test_generate.py
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ def test_zoom_range(self, l):
Nb tiles stored: 6
Nb error: 0
Total time: [0-9]+:[0-9][0-9]:[0-9][0-9]
Total size: 2.7 Kio
Total size: 2.[0-9] Kio
Time per tiles: [0-9]+ ms
Size per tile: 4[0-9][0-9] o
Expand Down Expand Up @@ -482,7 +482,7 @@ def test_no_zoom(self, l):
Nb tiles stored: 8
Nb error: 0
Total time: [0-9]+:[0-9][0-9]:[0-9][0-9]
Total size: 3.6 Kio
Total size: 3.[0-9] Kio
Time per tiles: [0-9]+ ms
Size per tile: 4[0-9][0-9] o
Expand Down Expand Up @@ -516,7 +516,7 @@ def test_py_buffer(self, l):
Nb tiles stored: 6
Nb error: 0
Total time: [0-9]+:[0-9][0-9]:[0-9][0-9]
Total size: 2.7 Kio
Total size: 2.[0-9] Kio
Time per tiles: [0-9]+ ms
Size per tile: 4[0-9][0-9] o
Expand Down Expand Up @@ -549,9 +549,9 @@ def test_zoom_list(self, l):
Nb tiles stored: 6
Nb error: 0
Total time: [0-9]+:[0-9][0-9]:[0-9][0-9]
Total size: 2.7 Kio
Total size: 2.[0-9] Kio
Time per tiles: [0-9]+ ms
Size per tile: 455 o
Size per tile: 4[0-9][0-9] o
""",
)
Expand Down Expand Up @@ -675,7 +675,7 @@ def test_hash_generation(self, l):
Nb tiles stored: 2
Nb error: 0
Total time: [0-9]+:[0-9][0-9]:[0-9][0-9]
Total size: 910 o
Total size: 9[0-9][0-9] o
Time per tiles: [0-9]+ ms
Size per tile: 4[0-9][0-9] o
Expand Down Expand Up @@ -941,9 +941,9 @@ def test_error_file(self):
'error.list',
u"""# \[[0-9][0-9]-[0-9][0-9]-20[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\] Start generation
# \[[0-9][0-9]-[0-9][0-9]-20[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\] Start the layer 'point_error' generation
0/0/0:\+8/\+8 # \[[0-9][0-9]-[0-9][0-9]-20[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\] 'cannot identify image file - .*
0/0/8:\+8/\+8 # \[[0-9][0-9]-[0-9][0-9]-20[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\] 'cannot identify image file - .*
0/8/0:\+8/\+8 # \[[0-9][0-9]-[0-9][0-9]-20[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\] 'cannot identify image file - .*
0/0/0:\+8/\+8 # \[[0-9][0-9]-[0-9][0-9]-20[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\] 'cannot identify image file .*
0/0/8:\+8/\+8 # \[[0-9][0-9]-[0-9][0-9]-20[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\] 'cannot identify image file .*
0/8/0:\+8/\+8 # \[[0-9][0-9]-[0-9][0-9]-20[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\] 'cannot identify image file .*
"""]],
)

Expand Down

0 comments on commit c0c6625

Please sign in to comment.