Commit Graph

1926 Commits

Author SHA1 Message Date
Alex Clark ☺
7522ca72b3 Merge pull request #699 from hugovk/unittest3
Use unittest for tests
2014-06-10 08:56:56 -04:00
hugovk
51427436d2 Merge remote-tracking branch 'upstream/master' into unittest3 2014-06-10 15:13:46 +03:00
Alex Clark
6a79d80374 Revert "Merge pull request #5 from hugovk/unittest1merge"
This reverts commit 0940f0b043, reversing
changes made to 07aa1a56bb.

Conflicts:
	.travis.yml
	test/helper.py
	test/test_imagedraw.py
2014-06-10 07:45:42 -04:00
Alex Clark
b2a2f16b23 Revert "Merge pull request #693 from hugovk/unittest0"
This reverts commit 001b46c670, reversing
changes made to 8beb66443b.
2014-06-10 07:43:23 -04:00
Alex Clark
3ff590d253 Revert "Update"
This reverts commit 1d96522932.
2014-06-10 07:42:57 -04:00
hugovk
7794831704 Bring back tester.py for now. Not using it for unit tests. 2014-06-10 13:36:38 +03:00
hugovk
7178279b21 Specify tests more closely to avoid things like Tests/cms_test.py 2014-06-10 13:02:52 +03:00
hugovk
c8b9411321 Fix test path for Travis CI 2014-06-10 12:38:20 +03:00
hugovk
0878dfd010 Update Travis CI to run new tests based on unittest 2014-06-10 12:26:50 +03:00
hugovk
1686016f1c Remove old tester.py so it's not picked up by nosetests as a test 2014-06-10 12:20:51 +03:00
hugovk
4dd47fc697 Add test base class and helper functions 2014-06-10 12:12:53 +03:00
hugovk
3ec505958e Convert old tests to use unittest 2014-06-10 12:10:47 +03:00
hugovk
c66f332679 Remove empty tests 2014-06-10 12:09:47 +03:00
hugovk
e8ef927bac Remove test_001_archive.py as it doesn't do anything: ../pil-archive/* doesn't exist 2014-06-10 12:05:46 +03:00
Alex Clark
a78b713d88 Revert "Add test runner"
This reverts commit b7f94e3609.
2014-06-09 20:56:34 -04:00
Alex Clark
e7bd48fa5e Revert "Experimental import fix"
This reverts commit 7a10f6b39a.
2014-06-09 20:56:32 -04:00
Alex Clark
7a866e7431 Revert "Fix broken py3 tests"
This reverts commit 0c47ce00b1.
2014-06-09 20:56:29 -04:00
Alex Clark
0c47ce00b1 Fix broken py3 tests 2014-06-09 20:36:40 -04:00
Alex Clark
7a10f6b39a Experimental import fix
Why would this work local but not on travis?
2014-06-09 20:21:31 -04:00
Alex Clark
b7f94e3609 Add test runner 2014-06-09 20:03:57 -04:00
Alex Clark
1d96522932 Update 2014-06-08 07:02:58 -04:00
Alex Clark ☺
001b46c670 Merge pull request #693 from hugovk/unittest0
Start using unittest for tests
2014-06-08 07:02:02 -04:00
Hugo
0940f0b043 Merge pull request #5 from hugovk/unittest1merge
More tests and merge with upstream
2014-06-08 13:49:00 +03:00
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