Aldo Cortesi
0d4a930397
Try not updating OpenSSL for now
2016-06-03 12:46:48 +12:00
Aldo Cortesi
e584ef0c56
Make dev.sh noisy to troubleshoot OpenSSL travis issue
2016-06-03 12:37:20 +12:00
Aldo Cortesi
e60860e65d
Make tcp.Client.connect return a context manager that closes the connection
2016-06-03 12:06:36 +12:00
Aldo Cortesi
36383a6146
Pathod websocket service threads should not be immortal
2016-06-03 11:58:05 +12:00
Aldo Cortesi
c5076f5e01
Implement a service connection handler counter, use it in Pathod test suite
...
Lots of failures, but that's a good thing.
2016-06-03 11:47:07 +12:00
Aldo Cortesi
c6d15904f3
Merge remote-tracking branch 'upstream/master' into testsuite
2016-06-03 10:19:22 +12:00
Thomas Kriechbaumer
b9ad7be5ac
Merge pull request #1199 from dufferzafar/pathod-generator-hotfix
...
Handle the slice object case in TransformGenerator.__getitem__
2016-06-02 22:45:55 +02:00
Shadab Zafar
8e60a9bca9
Handle the slice object case in TransformGenerator.__getitem__
2016-06-03 02:00:58 +05:30
Thomas Kriechbaumer
66ec1940ac
Merge pull request #1198 from s4chin/add-install-instructions
...
Add installation section to README
2016-06-02 20:06:24 +02:00
Sachin Kelkar
2ca066b7d6
Update README
2016-06-02 23:27:26 +05:30
Maximilian Hils
d84610a41d
web: use object spread operator
...
While the spread operator is not part of ES6, React also uses it for JSX.
It makes sense for us to keep it in other parts of the codebase as well.
2016-06-02 10:24:33 -07:00
Maximilian Hils
5e385405ca
please flake8
2016-06-02 09:54:19 -07:00
Maximilian Hils
29c52d98dc
Merge remote-tracking branch 'duffer/pathod-lang-generators'
2016-06-02 09:53:22 -07:00
Shadab Zafar
75ce2498e8
Simplify rand_byte by creating a special case for Python 2
2016-06-02 13:34:18 +05:30
Aldo Cortesi
5fd52970fd
Satisfy linting gods
2016-06-02 19:55:52 +12:00
Aldo Cortesi
69de78515d
Make last_log actually return last log
2016-06-02 19:45:18 +12:00
Aldo Cortesi
c9dd574f48
Silence requests warnings
...
Once we convert the rest of the suite to pathoc, this can go.
2016-06-02 19:40:39 +12:00
Aldo Cortesi
d8c52964c7
Reimplement test retrievals on pathoc and ditch requests
...
Requests uses urllib3, which has a connection pool that's not easy to disable
(https://github.com/shazow/urllib3/issues/383 ).
2016-06-02 19:36:02 +12:00
Shadab Zafar
c4da7e026c
Enable Travis for test_language_generators
2016-06-02 13:03:18 +05:30
Shadab Zafar
ec5d931ee3
Remove redundant __getslice__ from TransformGenerator
2016-06-02 13:02:17 +05:30
Shadab Zafar
b510616c69
Py3: Return bytes from FileGenerator
...
and use __getitem__ instead of __getslice__
2016-06-02 13:00:44 +05:30
Shadab Zafar
a04d7fd166
Py3: Return bytes from RandomGenerator
...
and use __getitem__ rather than __getslice__
2016-06-02 13:00:02 +05:30
Aldo Cortesi
a7522d9308
pathod.test shouldn't use the API at all
2016-06-02 18:27:51 +12:00
Aldo Cortesi
254614e9f7
Since we have locks over the logs, use direct access rather than API requests to get to them
2016-06-02 18:10:36 +12:00
Aldo Cortesi
40156ce123
Bump error timeout
2016-06-02 17:55:11 +12:00
Aldo Cortesi
5e12384486
Remove debug print
2016-06-02 17:54:34 +12:00
Aldo Cortesi
92decf96dd
Add expect_log to the pathod test truss, and use it for last_log
2016-06-02 17:46:37 +12:00
Aldo Cortesi
007a03664c
Move the admonision to use Discourse in the issue template to the bottom
...
Github integrations get the raw issue text, which means that the context we see
in-channel is mostly the admonition. I think it's visible enough at the bottom
to catch most users who would have paid attention to it if it were at the top.
2016-06-02 17:11:23 +12:00
Aldo Cortesi
14d6e1d2e3
Formatting of README
...
This is really a pretext to get Travis to rebuild, because it's stuck on the
wrong commit for the branch.
2016-06-02 16:43:46 +12:00
Aldo Cortesi
29bcdc8250
Fix lock over pathod locks
...
There were basically a nop before... o_O
2016-06-02 16:08:17 +12:00
Aldo Cortesi
ffca395e48
Honesty in testing
...
- Don't skip tests that fail
- Don't omit console from coverage
I'm working on the pathod races, and can't seem to reproduce the failures
locally.
Also, let's not kid ourselves about the console coverage - it should be
tracked. To improve it, we should measure it. Regressions in coverage of the
module should be flagged by CI.
2016-06-02 14:44:06 +12:00
Aldo Cortesi
07f7905f91
Merge pull request #1191 from cortesi/utils
...
Utils reorganisation
2016-06-02 13:14:56 +12:00
Aldo Cortesi
09da1febbd
Shift a bunch more string-related functions to strutils
2016-06-02 13:04:19 +12:00
Aldo Cortesi
31012d782f
Consolidate some functions to strutils.bytes_to_escaped_str
2016-06-02 12:53:12 +12:00
Aldo Cortesi
3d9dbd6a49
xrepr is used exactly once. move to pathoc.py.
2016-06-02 12:37:24 +12:00
Aldo Cortesi
cccdc98426
Utils reorganisation: add netlib.strutils
...
Extract a number of string and format-related functions to netlib.strutils.
2016-06-02 12:31:41 +12:00
Aldo Cortesi
eaa3b308f7
Fix non-deterministic test failures in export
...
We had various places in the code where we relied on incidental order of dict
keys. Add a helper to multidict, and fix.
2016-06-02 11:37:18 +12:00
Aldo Cortesi
92cdca50c7
Make Travis behave
2016-06-01 17:45:03 +12:00
Aldo Cortesi
08c82804e6
Ditch IRC Travis notifications, try to fix Slack Travis notifications
2016-06-01 17:26:55 +12:00
Aldo Cortesi
3206a48ceb
Remove downloads for now
...
Fixes #1185
2016-06-01 17:07:15 +12:00
Aldo Cortesi
1a08048a8d
Un-break mitmproxy console
2016-06-01 16:51:17 +12:00
Aldo Cortesi
92b24c6653
Merge pull request #1183 from mitmproxy/module-imports
...
use module-level imports only
2016-06-01 16:26:55 +12:00
Aldo Cortesi
137ee28bd6
Fix test suite
2016-06-01 15:10:54 +12:00
Aldo Cortesi
d60fdebc47
Fix lint harder
2016-06-01 14:50:06 +12:00
Aldo Cortesi
efbdd8d266
Merge branch 'module-imports' of github.com:mitmproxy/mitmproxy into module-imports
2016-06-01 14:43:24 +12:00
Aldo Cortesi
afcfa783ea
Satisfy lint
2016-06-01 14:43:08 +12:00
Maximilian Hils
1ca45b1e64
fix imports
2016-05-31 19:35:10 -07:00
Maximilian Hils
3aa8d42b05
fix PIL import
2016-05-31 19:25:47 -07:00
Maximilian Hils
0a2e7a97cd
use module-level imports only
2016-05-31 19:06:57 -07:00
Maximilian Hils
1dd078beb2
Merge pull request #1182 from cortesi/netlibimports
...
Reorganise netlib imports according to Google Style Guide
2016-05-31 17:33:57 -07:00
