Skip to content

Commit a0a237c

Browse files
bigtable: system tests (#1461)
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
1 parent 0f46879 commit a0a237c

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

packages/bigtable/system-test/bigtable.js

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
var assert = require('assert');
2020
var async = require('async');
21-
var uuid = require('node-uuid');
2221
var exec = require('methmeth');
2322
var extend = require('extend');
23+
var uuid = require('node-uuid');
2424

2525
var Table = require('../src/table.js');
2626
var Family = require('../src/family.js');
@@ -39,15 +39,19 @@ function generateTableName() {
3939
}
4040

4141
(isTestable ? describe : describe.skip)('Bigtable', function() {
42-
var bigtable = new Bigtable(extend({}, env, {
43-
cluster: clusterName,
44-
zone: zoneName
45-
}));
42+
var bigtable;
4643

4744
var TABLE_NAME = generateTableName();
48-
var TABLE = bigtable.table(TABLE_NAME);
45+
var TABLE;
4946

5047
before(function(done) {
48+
bigtable = new Bigtable(extend({
49+
cluster: clusterName,
50+
zone: zoneName
51+
}, env));
52+
53+
TABLE = bigtable.table(TABLE_NAME);
54+
5155
bigtable.getTables(function(err, tables) {
5256
if (err) {
5357
done(err);
@@ -127,9 +131,10 @@ function generateTableName() {
127131

128132
describe('column families', function() {
129133
var FAMILY_NAME = 'presidents';
130-
var FAMILY = TABLE.family(FAMILY_NAME);
134+
var FAMILY;
131135

132136
before(function(done) {
137+
FAMILY = TABLE.family(FAMILY_NAME);
133138
FAMILY.create(done);
134139
});
135140

0 commit comments

Comments
 (0)