From 08eeb90238b269861bf49e4c84a6b9805d8204f4 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Sun, 31 Jul 2016 22:43:08 -0400 Subject: [PATCH] bigtable: system tests Mocha will run blocks, even if they are skipped. This was causing errors to be thrown if the contributor didn't have the Bigtable env vars set --- packages/bigtable/system-test/bigtable.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/packages/bigtable/system-test/bigtable.js b/packages/bigtable/system-test/bigtable.js index 678f5d8bcf9..061c9eb6eed 100644 --- a/packages/bigtable/system-test/bigtable.js +++ b/packages/bigtable/system-test/bigtable.js @@ -18,9 +18,9 @@ var assert = require('assert'); var async = require('async'); -var uuid = require('node-uuid'); var exec = require('methmeth'); var extend = require('extend'); +var uuid = require('node-uuid'); var Table = require('../src/table.js'); var Family = require('../src/family.js'); @@ -39,15 +39,19 @@ function generateTableName() { } (isTestable ? describe : describe.skip)('Bigtable', function() { - var bigtable = new Bigtable(extend({}, env, { - cluster: clusterName, - zone: zoneName - })); + var bigtable; var TABLE_NAME = generateTableName(); - var TABLE = bigtable.table(TABLE_NAME); + var TABLE; before(function(done) { + bigtable = new Bigtable(extend({ + cluster: clusterName, + zone: zoneName + }, env)); + + TABLE = bigtable.table(TABLE_NAME); + bigtable.getTables(function(err, tables) { if (err) { done(err); @@ -127,9 +131,10 @@ function generateTableName() { describe('column families', function() { var FAMILY_NAME = 'presidents'; - var FAMILY = TABLE.family(FAMILY_NAME); + var FAMILY; before(function(done) { + FAMILY = TABLE.family(FAMILY_NAME); FAMILY.create(done); });