3 Commits

Author	SHA1	Message	Date
Joe Bowser	390927772e	Reverting the refactor. I'd rather have 4 failures due to timing than tests completely disappear	2015-02-11 14:28:50 -08:00
Andrew Grieve	4358a04730	Big Refactor of integration tests: use locks rather than timeouts, deleted disabled tests, Use same activity for most tests	2015-02-10 22:04:42 -05:00
Joe Bowser	a7ccb9243d	Merging latest master, including new tests	2014-08-14 14:20:49 -07:00