You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2014/09/01 15:06:45 UTC

[1/2] couchdb commit: updated refs/heads/master to 7465fe8

Repository: couchdb
Updated Branches:
  refs/heads/master eba4562f3 -> 7465fe8a0


fix spec


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/7465fe8a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/7465fe8a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/7465fe8a

Branch: refs/heads/master
Commit: 7465fe8a0700a0ab427d246e59b27c6821d7be2a
Parents: 32412d9
Author: Robert Newson <rn...@apache.org>
Authored: Mon Sep 1 12:14:30 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Mon Sep 1 12:16:05 2014 +0100

----------------------------------------------------------------------
 share/www/spec/couch_js_class_methods_spec.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/7465fe8a/share/www/spec/couch_js_class_methods_spec.js
----------------------------------------------------------------------
diff --git a/share/www/spec/couch_js_class_methods_spec.js b/share/www/spec/couch_js_class_methods_spec.js
index 6b64c19..fc8db36 100644
--- a/share/www/spec/couch_js_class_methods_spec.js
+++ b/share/www/spec/couch_js_class_methods_spec.js
@@ -300,11 +300,11 @@ describe 'CouchDB class'
       
       it 'should add flush true to the request when there is a test argument'
         CouchDB.should.receive("request", "once").with_args("GET", "/_stats/httpd/requests?flush=true")
-        CouchDB.requestStats(['httpd', 'requests'], 'test');
+        CouchDB.requestStats(['couchdb', 'httpd', 'requests'], 'test');
       end
       
       it 'should still work when there is a test argument'
-        var stats = CouchDB.requestStats(['httpd_status_codes', '200'], 'test');
+        var stats = CouchDB.requestStats(['couchdb', 'httpd_status_codes', 200], 'test');
         stats.description.should.eql 'number of HTTP 200 OK responses'
         stats.sum.should.be_a Number
       end
@@ -398,4 +398,4 @@ describe 'CouchDB class'
       end
     end
   end
-end
\ No newline at end of file
+end


[2/2] couchdb commit: updated refs/heads/master to 7465fe8

Posted by rn...@apache.org.
flush stats in test


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/32412d95
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/32412d95
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/32412d95

Branch: refs/heads/master
Commit: 32412d95333e058b6a9fc2aab1c714d419575eef
Parents: eba4562
Author: Robert Newson <rn...@apache.org>
Authored: Fri Aug 29 21:36:05 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Mon Sep 1 12:16:05 2014 +0100

----------------------------------------------------------------------
 share/www/script/test/changes.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/32412d95/share/www/script/test/changes.js
----------------------------------------------------------------------
diff --git a/share/www/script/test/changes.js b/share/www/script/test/changes.js
index d1c0c02..d5a4236 100644
--- a/share/www/script/test/changes.js
+++ b/share/www/script/test/changes.js
@@ -609,9 +609,9 @@ couchTests.changes = function(debug) {
   TEquals("0", resp.results[0].id);
   TEquals("1", resp.results[1].id);
 
-  TEquals(0, CouchDB.requestStats(['couchdb', 'httpd', 'clients_requesting_changes']).value);
+  TEquals(0, CouchDB.requestStats(['couchdb', 'httpd', 'clients_requesting_changes'], true).value);
   CouchDB.request("GET", "/" + db.name + "/_changes");
-  TEquals(0, CouchDB.requestStats(['couchdb', 'httpd', 'clients_requesting_changes']).value);
+  TEquals(0, CouchDB.requestStats(['couchdb', 'httpd', 'clients_requesting_changes'], true).value);
 
   // COUCHDB-1256
   T(db.deleteDb());