fixing problems in integration tests

cli/src/utils/start_rdb_server.js

@@ -107,17 +107,22 @@ class RethinkdbServer {
   }
 
   close() {
+    console.log('closing rdb server');
     return new Promise((resolve) => {
       if (this.proc.exitCode !== null) {
+        console.log('rdb server already exited');
         resolve();
       } else {
+        console.log('killing server with sigterm');
         this.proc.kill('SIGTERM');
 
         this.proc.once('exit', () => {
+          console.log('rdb server exited');
           resolve();
         });
 
         setTimeout(() => {
+          console.log('killing server with sigkill');
           this.proc.kill('SIGKILL');
           resolve();
         }, 20000).unref();

plugin-router/base/src/index.js

@@ -19,6 +19,7 @@ class PluginRouter extends EventEmitter {
   }
 
   close() {
+    console.log(`closing plugin-router: ${JSON.stringify(this.plugins.keys())}`);
     return Promise.all(Array.from(this.plugins.keys()).map((p) => this.remove(p)));
   }
 
@@ -71,14 +72,17 @@ class PluginRouter extends EventEmitter {
     }
 
     this.plugins.delete(name);
+    console.log(`deactivating plugin ${name}`);
     return plugin.activatePromise.then((active) => {
       for (const m in active.methods) {
         this.horizon.removeMethod(m);
       }
       if (plugin.deactivate) {
         return plugin.deactivate(this.context, plugin.options,
-                                 reason || 'Removed from PluginRouter.');
+                                 reason || 'Removed from PluginRouter.').then(() =>
+          console.log(`plugin ${name} deactivated, removing methods`));
       }
+      console.log(`plugin ${name} has no deactivate, done`);
     });
   }
 

plugin-utils/src/utils.js

@@ -51,14 +51,11 @@ const reqlOptions = {
   binaryFormat: 'raw',
 };
 
-const versionField = '$hz_v$';
-
 module.exports = {
   rethinkdbVersionCheck,
   remakeError,
   isObject,
   reqlOptions,
-  versionField,
   reads: require('./reads'),
   writes: require('./writes'),
   test: require('./test'),

plugin-utils/src/writes.js

@@ -1,12 +1,10 @@
 'use strict';
 
-const utils = require('./utils');
-
 const assert = require('assert');
 
 const {r} = require('@horizon/server');
 
-const hz_v = utils.version_field;
+const hz_v = '$hz_v$';
 
 // Common functionality used by write requests
 const invalidated_msg = 'Write invalidated by another request, try again.';
@@ -15,7 +13,7 @@ const timeout_msg = 'Operation timed out.';
 const unauthorized_msg = 'Operation not permitted.';
 
 function apply_version(row, new_version) {
-  row.merge(r.object(hz_v, new_version));
+  return row.merge(r.object(hz_v, new_version));
 }
 
 function make_write_response(data) {
@@ -189,4 +187,5 @@ module.exports = {
   retry_loop,
   validate_old_row_required,
   validate_old_row_optional,
+  versionField: hz_v,
 };

plugins/collection/src/collection.js

@@ -63,8 +63,11 @@ module.exports = {
     });
   },
   deactivate: (context, options) => {
-    if (context[options.name]) {
-      context[options.name].close();
+    console.log('deactivating collections plugin');
+    const metadata = context[options.name];
+    delete context[options.name];
+    if (metadata) {
+      metadata.close();
     }
   },
 };

plugins/remove/src/remove.js

@@ -1,7 +1,8 @@
 'use strict';
 
 const {r} = require('@horizon/server');
-const {reqlOptions, writes, versionField: hz_v} = require('@horizon/plugin-utils');
+const {reqlOptions, writes} = require('@horizon/plugin-utils');
+const hz_v = writes.versionField;
 
 function remove(context) {
   return (request, response, next) => {

plugins/replace/src/replace.js

@@ -1,7 +1,8 @@
 'use strict';
 
 const {r} = require('@horizon/server');
-const {reqlOptions, writes, versionField: hz_v} = require('@horizon/plugin-utils');
+const {reqlOptions, writes} = require('@horizon/plugin-utils');
+const hz_v = writes.versionField;
 
 function replace(context) {
   return (request, response, next) => {

plugins/store/src/store.js

@@ -1,7 +1,8 @@
 'use strict';
 
 const {r} = require('@horizon/server');
-const {reqlOptions, writes, versionField: hz_v} = require('@horizon/plugin-utils');
+const {reqlOptions, writes} = require('@horizon/plugin-utils');
+const hz_v = writes.versionField;
 
 function store(context) {
   return (request, response, next) => {

plugins/update/src/update.js

@@ -1,7 +1,8 @@
 'use strict';
 
 const {r} = require('@horizon/server');
-const {reqlOptions, writes, versionField: hz_v} = require('@horizon/plugin-utils');
+const {reqlOptions, writes} = require('@horizon/plugin-utils');
+const hz_v = writes.versionField;
 
 function update(context) {
   return (request, response, next) => {

plugins/upsert/src/upsert.js

@@ -1,7 +1,8 @@
 'use strict';
 
 const {r} = require('@horizon/server');
-const {reqlOptions, writes, versionField: hz_v} = require('@horizon/plugin-utils');
+const {reqlOptions, writes} = require('@horizon/plugin-utils');
+const hz_v = writes.versionField;
 
 function upsert(context) {
   return (request, response, next) => {

test/src/test/test.js

@@ -12,10 +12,14 @@ const all_suites = ['prereq',
                     'watch',
                     'write',
                     'permissions'];
+
 const collection = 'test';
 
-before('Start RethinkDB Server', () => utils.start_rethinkdb());
-after('Stop RethinkDB Server', () => utils.stop_rethinkdb());
+before('Start servers', () => utils.startServers());
+after('Stop servers', () => utils.stopServers());
+
+before(`Creating general-purpose collection: '${collection}'`,
+       () => utils.create_collection(collection));
 
 beforeEach(
   /** @this mocha */
@@ -25,14 +29,7 @@ afterEach(
   /** @this mocha */
   function() { logger.info(`End test '${this.currentTest.title}'`); });
 
-describe('Horizon Server', () => {
-  before('Start Horizon Server', utils.start_horizon_server);
-  after('Close Horizon Server', utils.close_horizon_server);
-
-  before(`Creating general-purpose collection: '${collection}'`,
-         () => utils.create_collection(collection));
+beforeEach('Connect Horizon Client', utils.open_horizon_conn);
+afterEach('Close Horizon Client', utils.close_horizon_conn);
 
-  beforeEach('Connect Horizon Client', utils.open_horizon_conn);
-  afterEach('Close Horizon Client', utils.close_horizon_conn);
-  all_suites.forEach((s) => require(`./${s}`).suite(collection));
-});
+all_suites.forEach((s) => require(`./${s}`).suite(collection));

test/src/test/utils.js

@@ -15,23 +15,26 @@ const r = require('rethinkdb');
 const websocket = require('ws');
 
 const project_name = 'integration_test';
-const data_dir = './rethinkdb_data_test';
+const dataDir = './rethinkdb_data_test';
 
 const log_file = `./horizon_test_${process.pid}.log`;
 logger.level = 'debug';
 logger.add(logger.transports.File, {filename: log_file});
 logger.remove(logger.transports.Console);
 
 // Variables used by most tests
-let rdb_server, rdb_http_port, rdb_port, rdb_conn, horizon_server, horizon_port, horizon_conn, horizon_listeners, plugin_router;
+let rdb_server, rdb_http_port, rdb_port, rdb_conn, horizon_server, horizon_port, horizon_conn, horizon_listeners, plugin_router, http_server;
 let horizon_authenticated = false;
 
-const start_rethinkdb = () => {
-  logger.info('removing dir');
-  rm_sync_recursive(data_dir);
+function startServers() {
+  assert.strictEqual(horizon_server, undefined);
+  assert.strictEqual(plugin_router, undefined);
+
+  logger.info(`removing old rethinkdb data directory: ${dataDir}`);
+  rm_sync_recursive(dataDir);
 
   logger.info('creating server');
-  return start_rdb_server({dataDir: data_dir}).then((server) => {
+  return start_rdb_server({dataDir}).then((server) => {
     rdb_server = server;
     rdb_port = server.driver_port;
     rdb_http_port = server.http_port;
@@ -41,13 +44,66 @@ const start_rethinkdb = () => {
   }).then((conn) => {
     logger.info('connected');
     rdb_conn = conn;
-    return r.dbCreate(project_name).run(conn);
-  }).then((res) => {
-    assert.strictEqual(res.dbs_created, 1);
+  }).then(() => {
+    logger.info('creating http server');
+
+    http_server = new http.Server();
+    return new Promise((resolve, reject) => {
+      http_server.listen(0, () => {
+        logger.info('creating horizon server');
+        horizon_port = http_server.address().port;
+        horizon_server = new horizon.Server(http_server, {
+          project_name,
+          rdb_port,
+          auth: {
+            token_secret: 'hunter2',
+            allow_unauthenticated: true,
+          },
+        });
+
+        plugin_router = new PluginRouter(horizon_server);
+        const plugins_promise = plugin_router.add(defaults, {
+          auto_create_collection: true,
+          auto_create_index: true,
+        });
+
+        horizon_server.events.on('ready', () => {
+          logger.info('horizon server ready');
+          plugins_promise.then(resolve).catch(reject);
+        });
+        horizon_server.events.on('unready', (server, err) => {
+          logger.info(`horizon server unready: ${err}`);
+        });
+      });
+      http_server.on('error', reject);
+    });
   });
-};
+}
+
+function stopServers() {
+  let localRdbServer = rdb_server;
+  let localPluginRouter = plugin_router;
+  let localHorizonServer = horizon_server;
+  plugin_router = undefined;
+  horizon_server = undefined;
+  rdb_server = undefined;
 
-const stop_rethinkdb = () => rdb_server && rdb_server.close();
+  return Promise.resolve().then(() => {
+    if (localPluginRouter) {
+      return localPluginRouter.close();
+    }
+  }).then(() => {
+    if (localHorizonServer) {
+      localHorizonServer.events.removeAllListeners('ready');
+      localHorizonServer.events.removeAllListeners('unready');
+      return localHorizonServer.close();
+    }
+  }).then(() => {
+    if (localRdbServer) {
+      localRdbServer.close();
+    }
+  });
+}
 
 // Used to prefix reql queries with the underlying table of a given collection
 const table = (collection) =>
@@ -125,55 +181,6 @@ const populate_collection = (collection, rows) => {
   }
 };
 
-const start_horizon_server = (done) => {
-  logger.info('creating http server');
-  assert.strictEqual(horizon_server, undefined);
-  assert.strictEqual(plugin_router, undefined);
-
-  const http_server = new http.Server();
-  http_server.listen(0, () => {
-    logger.info('creating horizon server');
-    horizon_port = http_server.address().port;
-    horizon_server = new horizon.Server(http_server, {
-      project_name,
-      rdb_port,
-      auth: {
-        token_secret: 'hunter2',
-        allow_unauthenticated: true,
-      },
-    });
-
-    plugin_router = new PluginRouter(horizon_server);
-    const plugins_promise = plugin_router.add(defaults, {
-      auto_create_collection: true,
-      auto_create_index: true,
-    });
-
-    horizon_server.events.on('ready', () => {
-      logger.info('horizon server ready');
-      plugins_promise.then(() => done()).catch(done);
-    });
-    horizon_server.events.on('unready', (server, err) => {
-      logger.info(`horizon server unready: ${err}`);
-    });
-  });
-  http_server.on('error', (err) => done(err));
-};
-
-const close_horizon_server = () => {
-  if (plugin_router !== undefined) {
-    plugin_router.close();
-  }
-  plugin_router = undefined;
-
-  if (horizon_server !== undefined) {
-    horizon_server.events.removeAllListeners('ready');
-    horizon_server.events.removeAllListeners('unready');
-    horizon_server.close();
-  }
-  horizon_server = undefined;
-};
-
 const add_horizon_listener = (request_id, cb) => {
   assert(horizon_authenticated, 'horizon_conn was not authenticated before making requests');
   assert.notStrictEqual(request_id, undefined);
@@ -306,12 +313,12 @@ module.exports = {
   horizon_port: () => horizon_port,
   horizon_listeners: () => horizon_listeners,
 
-  start_rethinkdb, stop_rethinkdb,
+  startServers, stopServers,
+
   create_collection,
   populate_collection,
   clear_collection,
 
-  start_horizon_server, close_horizon_server,
   open_horizon_conn, close_horizon_conn,
   horizon_auth, horizon_admin_auth, horizon_default_auth,
   add_horizon_listener, remove_horizon_listener,

test/src/test/write.js

@@ -6,7 +6,7 @@ const pluginUtils = require('@horizon/plugin-utils');
 const assert = require('assert');
 const crypto = require('crypto');
 
-const hz_v = pluginUtils.version_field;
+const hz_v = pluginUtils.writes.versionField;
 const invalidated_msg = pluginUtils.writes.invalidated_msg;
 
 // Before each test, ids [0, 4) will be present in the collection
@@ -48,7 +48,7 @@ const all_tests = (collection) => {
 
   const make_request = (type, data, options) => ({
     request_id: crypto.randomBytes(4).readUInt32BE(),
-    options: Object.assign({type: []}, options || {}, {collection, data}),
+    options: Object.assign({}, options || {}, {collection: [collection], [type]: data}),
   });
 
   const check_collection = (expected, done) => {
@@ -571,7 +571,7 @@ const all_tests = (collection) => {
     // per iteration with the database.  In order to test timeouts, we use a
     // timeout of zero, so the other rows should immediately error.
     describe('Zero Timeout', () => {
-      const timeout = {timeout: 0};
+      const timeout = {timeout: [0]};
       const test_data = [{id: 0, value: 0}];
       beforeEach('Populate collection', () => utils.populate_collection(collection, test_data));