Merge remote-tracking branch 'origin/pr/22'

tests/helper.py

@@ -4,13 +4,8 @@ import tornado.testing
 
 class ExternalVersionTestCase(tornado.testing.AsyncTestCase):
     def sync_get_version(self, name, config):
-        result = {}
-
         def get_version_callback(name, version):
-            result["version"] = version
-            self.stop()
+            self.stop(version)
 
         get_version(name, config, get_version_callback)
-        self.wait()
-
-        return result["version"]
+        return self.wait()