Skip to content
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

storage: restore system tests #2407

Merged
merged 2 commits into from
Jun 29, 2017
Merged

storage: restore system tests #2407

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce01fa7
Revert "storage: tests: skip tests that CI does not have permissions …
stephenplusplus Jun 23, 2017
8f9c8a1
change prefix
stephenplusplus Jun 23, 2017
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
80 changes: 37 additions & 43 deletions packages/storage/system-test/storage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ var Bucket = Storage.Bucket;
var File = Storage.File;

describe('storage', function() {
var IS_CI = env.projectId === 'long-door-651';
var TESTS_PREFIX = 'gcloud-test-';
var TESTS_PREFIX = 'gcloud-tests-';

This comment was marked as spam.

Sign in to view


var storage = new Storage(env);
var bucket = storage.bucket(generateName());
Expand All @@ -61,13 +60,6 @@ describe('storage', function() {
});

after(function(done) {
if (IS_CI) {
// The system tests account is unable to delete files.
// RE: https://github.com/GoogleCloudPlatform/google-cloud-node/issues/2224
done();
return;
}

storage.getBuckets({
prefix: TESTS_PREFIX
}, function(err, buckets) {
Expand Down Expand Up @@ -499,6 +491,13 @@ describe('storage', function() {
});

describe('buckets', function() {
var bucket;

before(function() {
bucket = storage.bucket(generateName('bucket'));
return bucket.create();
});

it('should get a policy', function(done) {
bucket.iam.getPolicy(function(err, policy) {
assert.ifError(err);
Expand All @@ -524,38 +523,43 @@ describe('storage', function() {
});

it('should set a policy', function(done) {
var policy = {
bindings: [
{
role: 'roles/storage.legacyBucketReader',
members: [
'allUsers'
]
}
]
};

bucket.iam.setPolicy(policy, function(err, newPolicy) {
bucket.iam.getPolicy(function(err, policy) {
assert.ifError(err);
assert.deepEqual(newPolicy.bindings, policy.bindings);
done();

policy.bindings.push({
role: 'roles/storage.legacyBucketReader',
members: [
'allUsers'
]
});

bucket.iam.setPolicy(policy, function(err, newPolicy) {
assert.ifError(err);

var legacyBucketReaderBinding = newPolicy.bindings
.filter(function(binding) {
return binding.role === 'roles/storage.legacyBucketReader';
})[0];

assert(legacyBucketReaderBinding.members.includes('allUsers'));

done();
});
});
});

it('should test the iam permissions', function(done) {
var testPermissions = [
'storage.buckets.get',

// Unable to test.
// RE: https://github.com/GoogleCloudPlatform/google-cloud-node/issues/2224
// 'storage.buckets.getIamPolicy'
'storage.buckets.getIamPolicy'
];

bucket.iam.testPermissions(testPermissions, function(err, permissions) {
assert.ifError(err);

assert.deepEqual(permissions, {
'storage.buckets.get': true
'storage.buckets.get': true,
'storage.buckets.getIamPolicy': true
});

done();
Expand Down Expand Up @@ -610,12 +614,6 @@ describe('storage', function() {

describe('bucket metadata', function() {
it('should allow setting metadata on a bucket', function(done) {
if (IS_CI) {
// RE: https://github.com/GoogleCloudPlatform/google-cloud-node/issues/2224
this.skip();
return;
}

var metadata = {
website: {
mainPageSuffix: 'http://fakeuri',
Expand All @@ -631,8 +629,7 @@ describe('storage', function() {
});
});

// RE: https://github.com/GoogleCloudPlatform/google-cloud-node/issues/2224
(IS_CI ? describe.skip : describe)('write/read/remove files', function() {
describe('write, read, and remove files', function() {
before(function(done) {
function setHash(filesKey, done) {
var file = FILES[filesKey];
Expand Down Expand Up @@ -1074,8 +1071,7 @@ describe('storage', function() {
});
});

// RE: https://github.com/GoogleCloudPlatform/google-cloud-node/issues/2224
(IS_CI ? describe.skip : describe)('combine files', function() {
describe('combine files', function() {
it('should combine multiple files into one', function(done) {
var files = [
{ file: bucket.file('file-one.txt'), contents: '123' },
Expand Down Expand Up @@ -1107,8 +1103,7 @@ describe('storage', function() {
});
});

// RE: https://github.com/GoogleCloudPlatform/google-cloud-node/issues/2224
(IS_CI ? describe.skip : describe)('list files', function() {
describe('list files', function() {
var NEW_FILES = [
bucket.file('CloudLogo1'),
bucket.file('CloudLogo2'),
Expand Down Expand Up @@ -1262,7 +1257,7 @@ describe('storage', function() {
});
});

(IS_CI ? describe.skip : describe)('sign urls', function() {
describe('sign urls', function() {
var localFile = fs.readFileSync(FILES.logo.path);
var file;

Expand Down Expand Up @@ -1310,8 +1305,7 @@ describe('storage', function() {
});
});

// RE: https://github.com/GoogleCloudPlatform/google-cloud-node/issues/2224
(IS_CI ? describe.skip : describe)('sign policy', function() {
describe('sign policy', function() {
var file;

before(function(done) {
Expand Down