diff options
author | Robert Newson <rnewson@apache.org> | 2014-08-29 13:51:03 +0100 |
---|---|---|
committer | Robert Newson <rnewson@apache.org> | 2014-08-29 13:51:03 +0100 |
commit | 4ad8de2baefa471c3beb0cacfc67569deb1bad99 (patch) | |
tree | 83de84865d31f9c4ee908c529496d2ee5a0d99aa | |
parent | 13fa1e3faf8e3022bff6e0baab2ec41ff2ac734c (diff) | |
download | couchdb-4ad8de2baefa471c3beb0cacfc67569deb1bad99.tar.gz |
Update tests for new _stats API
-rw-r--r-- | share/www/script/test/auth_cache.js | 6 | ||||
-rw-r--r-- | share/www/script/test/stats.js | 20 |
2 files changed, 13 insertions, 13 deletions
diff --git a/share/www/script/test/auth_cache.js b/share/www/script/test/auth_cache.js index 17cb70f08..39b9887ea 100644 --- a/share/www/script/test/auth_cache.js +++ b/share/www/script/test/auth_cache.js @@ -52,13 +52,13 @@ couchTests.auth_cache = function(debug) { function hits() { var hits = CouchDB.requestStats(["couchdb", "auth_cache_hits"], true); - return hits.current || 0; + return hits.value || 0; } function misses() { var misses = CouchDB.requestStats(["couchdb", "auth_cache_misses"], true); - return misses.current || 0; + return misses.value || 0; } @@ -266,4 +266,4 @@ couchTests.auth_cache = function(debug) { // cleanup authDb.deleteDb(); -}
\ No newline at end of file +} diff --git a/share/www/script/test/stats.js b/share/www/script/test/stats.js index 6fb0fbba3..afc2ef5e4 100644 --- a/share/www/script/test/stats.js +++ b/share/www/script/test/stats.js @@ -22,7 +22,7 @@ couchTests.stats = function(debug) { }; function getStat(mod, key) { - return CouchDB.requestStats(mod, key, true); + return CouchDB.requestStats([mod, key], true); }; function doView(db) { @@ -40,9 +40,9 @@ couchTests.stats = function(debug) { function runTest(mod, key, funcs) { var db = newDb("test_suite_db", true); if(funcs.setup) funcs.setup(db); - var before = getStat(mod, key).current; + var before = getStat(mod, key).value; if(funcs.run) funcs.run(db); - var after = getStat(mod, key).current; + var after = getStat(mod, key).value; if(funcs.test) funcs.test(before, after); } @@ -52,9 +52,9 @@ couchTests.stats = function(debug) { var db = newDb("test_suite_db"); db.deleteDb(); - var before = getStat("couchdb", "open_databases").current; + var before = getStat("couchdb", "open_databases").value; db.createDb(); - var after = getStat("couchdb", "open_databases").current; + var after = getStat("couchdb", "open_databases").value; TEquals(before+1, after, "Creating a db increments open db count."); })(); @@ -78,8 +78,8 @@ couchTests.stats = function(debug) { var max = 5; var testFun = function() { - var pre_dbs = getStat("couchdb", "open_databases").current || 0; - var pre_files = getStat("couchdb", "open_os_files").current || 0; + var pre_dbs = getStat("couchdb", "open_databases").value || 0; + var pre_files = getStat("couchdb", "open_os_files").value || 0; var triggered = false; var db = null; @@ -99,7 +99,7 @@ couchTests.stats = function(debug) { } T(triggered, "We managed to force a all_dbs_active error."); - var open_dbs = getStat("couchdb", "open_databases").current; + var open_dbs = getStat("couchdb", "open_databases").value; TEquals(open_dbs > 0, true, "We actually opened some dbs."); TEquals(open_dbs, max, "We only have max db's open."); @@ -107,8 +107,8 @@ couchTests.stats = function(debug) { newDb("test_suite_db_" + i).deleteDb(); } - var post_dbs = getStat("couchdb", "open_databases").current; - var post_files = getStat("couchdb", "open_os_files").current; + var post_dbs = getStat("couchdb", "open_databases").value; + var post_files = getStat("couchdb", "open_os_files").value; TEquals(pre_dbs, post_dbs, "We have the same number of open dbs."); TEquals(pre_files, post_files, "We have the same number of open files."); }; |