Merge pull request #98 from ctiller/json

Yay fewer dependencies.
pull/99/head
nathanielmanistaatgoogle 10 years ago
commit 5cd3cd1806
  1. 6
      tools/run_tests/run_tests.py

@ -4,13 +4,13 @@
import argparse import argparse
import glob import glob
import itertools import itertools
import json
import multiprocessing import multiprocessing
import os import os
import sys import sys
import time import time
import jobset import jobset
import simplejson
import watch_dirs import watch_dirs
@ -159,12 +159,12 @@ class TestCache(object):
def save(self): def save(self):
with open('.run_tests_cache', 'w') as f: with open('.run_tests_cache', 'w') as f:
f.write(simplejson.dumps(self.dump())) f.write(json.dumps(self.dump()))
def maybe_load(self): def maybe_load(self):
if os.path.exists('.run_tests_cache'): if os.path.exists('.run_tests_cache'):
with open('.run_tests_cache') as f: 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): def _build_and_run(check_cancelled, newline_on_success, cache):

Loading…
Cancel
Save