From 0e017be98d8a05cff77c1e6f09acda0a4af2c4b6 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Tue, 3 Feb 2015 00:38:55 -0800 Subject: [PATCH] merge with master + fixups --- tests/python_tests/datasource_test.py | 2 +- tests/python_tests/image_test.py | 2 +- tests/python_tests/image_tiff_test.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/python_tests/datasource_test.py b/tests/python_tests/datasource_test.py index 62a6fab52..4ada3dc3c 100644 --- a/tests/python_tests/datasource_test.py +++ b/tests/python_tests/datasource_test.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -from nose.tools import eq_ +from nose.tools import eq_, raises from utilities import execution_path, run_all import os, mapnik from itertools import groupby diff --git a/tests/python_tests/image_test.py b/tests/python_tests/image_test.py index 800da573c..79ac92e33 100644 --- a/tests/python_tests/image_test.py +++ b/tests/python_tests/image_test.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- import os, mapnik -from nose.tools import eq_,raises +from nose.tools import eq_,raises, assert_almost_equal from utilities import execution_path, run_all, get_unique_colors def setup(): diff --git a/tests/python_tests/image_tiff_test.py b/tests/python_tests/image_tiff_test.py index 403370330..d8e4f6c1c 100644 --- a/tests/python_tests/image_tiff_test.py +++ b/tests/python_tests/image_tiff_test.py @@ -3,7 +3,7 @@ import os, mapnik import hashlib -from nose.tools import eq_ +from nose.tools import eq_, assert_not_equal from utilities import execution_path, run_all def hashstr(var):