Skip to content

bigtable: upgrade dependencies & clean system tests #1572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
callmehiphop merged 1 commit into from
Sep 7, 2016
Merged

bigtable: upgrade dependencies & clean system tests #1572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/bigtable/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@
"dependencies": {
"arrify": "^1.0.0",
"concat-stream": "^1.5.0",
"create-error-class": "^2.0.1",
"dot-prop": "^2.4.0",
"create-error-class": "^3.0.2",
"dot-prop": "^4.0.0",
"extend": "^3.0.0",
"@google-cloud/common": "^0.3.0",
"@google-cloud/common": "^0.4.0",
"google-proto-files": "^0.7.0",
"is": "^3.0.1",
"lodash.flatten": "^4.2.0",
Expand Down
71 changes: 34 additions & 37 deletions packages/bigtable/system-test/bigtable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,35 +28,25 @@ var Table = require('../src/table.js');
var Family = require('../src/family.js');
var Row = require('../src/row.js');

function generateName(obj) {
return ['test', obj, uuid.v4()].join('-');
}
var PREFIX = 'gcloud-tests-';

describe('Bigtable', function() {
var bigtable;
var bigtable = new Bigtable(env);

var INSTANCE_NAME = 'test-bigtable-instance';
var INSTANCE;

var TABLE_NAME = generateName('table');
var TABLE;

var CLUSTER_NAME = 'test-bigtable-cluster';
var INSTANCE = bigtable.instance(generateName('instance'));
var TABLE = INSTANCE.table(generateName('table'));
var CLUSTER_NAME = generateName('cluster');

before(function(done) {
bigtable = new Bigtable(env);

INSTANCE = bigtable.instance(INSTANCE_NAME);

var options = {
clusters: [{
name: CLUSTER_NAME,
location: 'us-central1-b',
nodes: 3
}]
};

INSTANCE.create(options, function(err, instance, operation) {
INSTANCE.create({
clusters: [
{
name: CLUSTER_NAME,
location: 'us-central1-b',
nodes: 3
}
]
}, function(err, instance, operation) {
if (err) {
done(err);
return;
Expand All @@ -65,8 +55,6 @@ describe('Bigtable', function() {
operation
.on('error', done)
.on('complete', function() {
TABLE = INSTANCE.table(TABLE_NAME);

TABLE.create({
families: ['follows', 'traits']
}, done);
Expand All @@ -75,7 +63,20 @@ describe('Bigtable', function() {
});

after(function(done) {
INSTANCE.delete(done);
bigtable.getInstances(function(err, instances) {
if (err) {
done(err);
return;
}

var testInstances = instances.filter(function(instance) {
return instance.id.indexOf(PREFIX) === 0;
});

async.eachLimit(testInstances, 5, function(instance, next) {
instance.delete(next);
}, done);
});
});

describe('instances', function() {
Expand Down Expand Up @@ -121,9 +122,7 @@ describe('Bigtable', function() {
});

it('should get a single instance', function(done) {
var instance = bigtable.instance(INSTANCE_NAME);

instance.get(done);
INSTANCE.get(done);
});

it('should update an instance', function(done) {
Expand Down Expand Up @@ -261,13 +260,7 @@ describe('Bigtable', function() {
});

it('should get a table', function(done) {
var table = INSTANCE.table(TABLE_NAME);

table.get(function(err, table_) {
assert.ifError(err);
assert.strictEqual(table, table_);
done();
});
TABLE.get(done);
});

it('should delete a table', function(done) {
Expand Down Expand Up @@ -931,3 +924,7 @@ describe('Bigtable', function() {
});

});

function generateName(resourceType) {
return PREFIX + resourceType + '-' + uuid.v1().substr(0, 8);
}