diff options
author | 2015-01-16 16:48:53 -0800 | |
---|---|---|
committer | 2015-01-16 16:48:53 -0800 | |
commit | 5cd3cd1806cceca01bfa6bcf896cd7f5f4e62ce3 (patch) | |
tree | ce3a0438e65b860ea843acf552a8006fb4776c72 | |
parent | a537ae465b2292f086ba0b161f7c30d827b49fbd (diff) | |
parent | 261dd98e5ebccfa2948929c78ec7e1c12f9a3fa8 (diff) |
Merge pull request #98 from ctiller/json
Yay fewer dependencies.
-rwxr-xr-x | tools/run_tests/run_tests.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index d291abf3bf..0826dfc7a4 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -4,13 +4,13 @@ import argparse import glob import itertools +import json import multiprocessing import os import sys import time import jobset -import simplejson import watch_dirs @@ -159,12 +159,12 @@ class TestCache(object): def save(self): with open('.run_tests_cache', 'w') as f: - f.write(simplejson.dumps(self.dump())) + f.write(json.dumps(self.dump())) def maybe_load(self): if os.path.exists('.run_tests_cache'): with open('.run_tests_cache') as f: - self.parse(simplejson.loads(f.read())) + self.parse(json.loads(f.read())) def _build_and_run(check_cancelled, newline_on_success, cache): |