Commit Graph

1903 Commits

Author SHA1 Message Date
hugovk
bc91358101 Merge remote-tracking branch 'upstream/master' into unittest1merge
Conflicts:
	Tests/test_imagedraw.py
2014-06-07 22:56:19 +03:00
Alex Clark ☺
8beb66443b Merge pull request #694 from hugovk/floodfill
Skip test_floodfill_border() on PyPy to avoid fatal error
2014-06-07 08:50:48 -04:00
hugovk
8693c63173 assert_warning() checks in case of multiple warnings 2014-06-07 00:23:55 +03:00
Alex Clark ☺
bf0e483472 Merge pull request #696 from Smashman/patch-1
Fix a its/it's incorrect usage
2014-06-06 16:48:08 -04:00
Ben Williams
9415407b83 Fix a its/it's incorrect usage 2014-06-06 21:42:20 +01:00
hugovk
5919c87afb Convert more tests 2014-06-06 17:13:29 +03:00
hugovk
3c7c89e642 Convert more tests, fix test_imagewin.py 2014-06-06 17:05:54 +03:00
hugovk
c4d3898006 Convert more tests 2014-06-06 16:55:00 +03:00
hugovk
cbb2f9dce9 Fix test/test_imagefileio.py 2014-06-06 15:26:48 +03:00
hugovk
3ff2ea4883 Disable lena() caching for now, convert more tests 2014-06-06 15:19:28 +03:00
hugovk
c45f20119c Fix syntax error 2014-06-06 14:53:33 +03:00
hugovk
e2e361141c Return duplicate in lena() 2014-06-06 14:04:26 +03:00
hugovk
40ada60cec Comment out lena() caching 2014-06-06 10:55:04 +03:00
hugovk
4ab5b6c583 Comment out lena() caching 2014-06-06 10:48:28 +03:00
hugovk
995f367755 Skip test_floodfill_border() on PyPy to avoid fatal error 2014-06-06 08:02:18 +03:00
Hugo
0eb92eccd7 Skip test_floodfill_border() on PyPy
Otherwise it sometimes, but not always, causes an error:

RPython traceback:
  File "rpython_jit_metainterp_compile.c", line 20472, in send_loop_to_backend
  File "rpython_jit_backend_x86_assembler.c", line 1818, in Assembler386_assemble_loop
  File "rpython_jit_backend_x86_regalloc.c", line 293, in RegAlloc_prepare_loop
  File "rpython_jit_backend_x86_regalloc.c", line 909, in RegAlloc__prepare
  File "rpython_jit_backend_llsupport_regalloc.c", line 4706, in compute_vars_longevity
Fatal RPython error: AssertionError
/home/travis/build.sh: line 236:  7300 Aborted
2014-06-05 22:10:12 +03:00
Hugo
e87ae09328 Delete test test [CI skip] 2014-06-05 21:31:26 +03:00
hugovk
e01e3e90d5 Convert more tests 2014-06-05 18:15:12 +03:00
hugovk
d18c406d39 Convert test_imagecolor.py 2014-06-05 17:27:03 +03:00
hugovk
8a870c0ee9 Convert more tests 2014-06-05 16:13:58 +03:00
hugovk
07aa1a56bb Save test_cffi for another day 2014-06-05 15:31:22 +03:00
hugovk
2833cb42b4 Fixes for test_cffi.py 2014-06-05 14:19:29 +03:00
hugovk
3249d8f3a5 Convert test_image_putpixel.py. More changes needed for test_cffi.py 2014-06-05 14:01:57 +03:00
hugovk
3fda42d280 Convert more tests 2014-06-05 13:39:45 +03:00
hugovk
34db40ddce Convert test_image_tobitmap.py 2014-06-05 12:39:15 +03:00
hugovk
1f94ea1fc6 Merge 2014-06-05 12:30:59 +03:00
hugovk
45fd3b8bf5 Merge remote-tracking branch 'upstream/master' into unittest0
Conflicts:
	.travis.yml
2014-06-05 12:29:35 +03:00
hugovk
82df06243c Convert more tests 2014-06-05 12:26:54 +03:00
hugovk
133120c6a6 assert_exception is assertRaises 2014-06-05 11:45:01 +03:00
hugovk
d385dd81a7 Converttest_image_load.py 2014-06-05 11:39:29 +03:00
Alex Clark
6858aef5b1 Update 2014-06-04 18:32:17 -04:00
Alex Clark ☺
841582fa26 Merge pull request #685 from hugovk/docstring
ImageCms fixes
2014-06-04 18:31:40 -04:00
hugovk
b7eb1de922 Fix skipping 2014-06-04 17:09:59 +03:00
hugovk
184c380e10 Convert more tests, including a method to skip on ImportError 2014-06-04 16:18:04 +03:00
hugovk
f14b928ce6 Rename tester.py to helper.py because it no longer drives the tests 2014-06-04 10:11:22 +03:00
hugovk
c8626c6e93 Move more tests 2014-06-04 09:09:23 +03:00
Alex Clark ☺
9ec63f94b2 Merge pull request #689 from hugovk/patch-1
Fix Coveralls link
2014-06-03 17:31:44 -04:00
Hugo
e518879c0e Fix Coveralls link 2014-06-04 00:11:31 +03:00
hugovk
2e52f3ab46 Move more tests; remove some redundant helpers 2014-06-04 00:05:48 +03:00
Alex Clark ☺
f28c230ef5 Merge pull request #688 from sciunto/docstring
DOC: fix name in docstring
2014-06-03 16:41:23 -04:00
Alex Clark
9497525abc Fix coveralls.io URLs 2014-06-03 16:39:17 -04:00
hugovk
d082c58043 pep8/pyflakes 2014-06-03 23:35:21 +03:00
François Boulogne
682ad75759 DOC: fix name in docstring 2014-06-03 16:34:23 -04:00
hugovk
2bde38d8f5 Move more tests; add more helpers; install unittest2 for Python 2.7 2014-06-03 23:22:02 +03:00
hugovk
5c8c777ea4 Start moving tests over to use unittest 2014-06-03 22:38:56 +03:00
hugovk
cd967680cb Move dummy test to test/ and run with nosetests 2014-06-03 18:04:27 +03:00
Alex Clark
dc667b1f19 Fix link 2014-06-03 09:01:57 -04:00
Alex Clark ☺
8b28c2c2f0 Merge pull request #686 from hugovk/patch-1
Fix Travis CI badge for new python-pillow name
2014-06-03 06:10:40 -04:00
hugovk
c9a4272af6 Replace python-imaging with python-pillow (but yet not Coveralls) 2014-06-03 13:02:44 +03:00
Hugo
9dc2346dea Fix Travis CI badge for new python-pillow name 2014-06-03 11:06:27 +03:00