diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-21 23:03:45 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-21 23:03:45 +0200 |
| commit | 2f670bac99943404952ebd5e76490e9643e50297 (patch) | |
| tree | b6b25128692be754084aa35c95191400ef592b95 /.appveyor.yml | |
| parent | 2da4aaf1ede8310bb14c22e82248002b97b5f3e5 (diff) | |
| download | mitmproxy-2f670bac99943404952ebd5e76490e9643e50297.tar.gz mitmproxy-2f670bac99943404952ebd5e76490e9643e50297.tar.bz2 mitmproxy-2f670bac99943404952ebd5e76490e9643e50297.zip | |
fix tests, use pytest
We currently test with unparallelized builds,
because there are apparently some race conditions
in the test suite, which I can't trigger locally
but happen on travis.
Squashed commit of the following:
commit 7dceb6dd3a1bdbc39688258bc4dff6eee685a33b
Author: Maximilian Hils <git@maximilianhils.com>
Date: Mon Sep 21 23:00:24 2015 +0200
disable parallelized tests
commit fc0c3f12ee9259162e83026851362925d93b69f2
Author: Maximilian Hils <git@maximilianhils.com>
Date: Mon Sep 21 22:49:19 2015 +0200
fix tests
commit baba3ca5ef49bdbd7aad14f1bf0626738fa3d21c
Author: Maximilian Hils <git@maximilianhils.com>
Date: Mon Sep 21 22:28:20 2015 +0200
fix tests, use py.test
Diffstat (limited to '.appveyor.yml')
| -rw-r--r-- | .appveyor.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 4e690c06..dbb6d2fa 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -8,4 +8,4 @@ install: - "%PYTHON%\\python -c \"from OpenSSL import SSL; print(SSL.SSLeay_version(SSL.SSLEAY_VERSION))\"" build: off # Not a C# project test_script: - - "%PYTHON%\\Scripts\\nosetests"
\ No newline at end of file + - "%PYTHON%\\Scripts\\py.test -n 4"
\ No newline at end of file |