Skip to content

Commit

Permalink
VOLAPI-101 docker test assertion failure when NFS support is disabled
Browse files Browse the repository at this point in the history
Reviewed by: Dave Eddy <dave.eddy@joyent.com>
Approved by: Dave Eddy <dave.eddy@joyent.com>
  • Loading branch information
Julien Gilli committed Jan 17, 2018
1 parent fa211d2 commit 62668a2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 6 additions & 2 deletions test/integration/api-create-invalid-names.test.js
Expand Up @@ -8,9 +8,9 @@
* Copyright 2018, Joyent, Inc.
*/

var test = require('tape');
var vasync = require('vasync');

var mod_testVolumes = require('../lib/volumes');
var testHelpers = require('./helpers');
var volumesApi = require('../lib/volumes-api');

Expand All @@ -20,6 +20,10 @@ var STATE = {
log: require('../lib/log')
};

var test = mod_testVolumes.createTestFunc({
checkTritonSupportsNfsVols: true
});

test('setup', function (tt) {

tt.test('docker env', function (t) {
Expand Down Expand Up @@ -52,7 +56,7 @@ test('api: create volumes with invalid name', function (tt) {
* 'x'.repeat(257) generates a volume name that is one character too
* long, as the max length for volume names is 256 characters.
*/
var INVALID_VOLUME_NAMES = ['', '-foo', '.foo', 'x'.repeat(257)];
var INVALID_VOLUME_NAMES = ['-foo', '.foo', 'x'.repeat(257)];

vasync.forEachParallel({
func: function createVolume(volumeName, done) {
Expand Down
2 changes: 0 additions & 2 deletions test/lib/volumes-api.js
Expand Up @@ -39,8 +39,6 @@ function createDockerVolume(opts, callback) {
assert.optionalString(opts.name, 'opts.name');
assert.func(callback, 'callback');

assert.ok(testVolumes.nfsSharedVolumesSupported());

var dockerClient = opts.dockerClient;
var dockerApiVersion = opts.apiVersion || ('v' + constants.API_VERSION);

Expand Down

0 comments on commit 62668a2

Please sign in to comment.