Fixed tests (example plugin, checkpoints)

apocas · Oct 24, 2017 · 8b7192f · 8b7192f
1 parent 21a7410
commit 8b7192f
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 36 deletions.
diff --git a/test/container.js b/test/container.js
@@ -52,8 +52,8 @@ describe("#container", function() {
     });
   });
 
-  describe("#checkpoints", function() {
-    it("should create container checkpoint", function(done) {
+  describe("#archive", function() {
+    it("should get an archive inside the container", function(done) {
       var container = docker.getContainer(testContainer);
 
       function handler(err, data) {
@@ -62,10 +62,12 @@ describe("#container", function() {
         done();
       }
 
-      container.createCheckpoint(handler);
+      container.getArchive({
+        'path': '/var/log/dmesg'
+      }, handler);
     });
 
-    it("should list containers checkpoints", function(done) {
+    it("should put an archive inside the container", function(done) {
       var container = docker.getContainer(testContainer);
 
       function handler(err, data) {
@@ -74,12 +76,12 @@ describe("#container", function() {
         done();
       }
 
-      container.listCheckpoint(handler);
+      container.putArchive('./test/test.tar', {
+        'path': '/root'
+      }, handler);
     });
-  });
 
-  describe("#archive", function() {
-    it("should get an archive inside the container", function(done) {
+    it("should inspect an archive inside the container", function(done) {
       var container = docker.getContainer(testContainer);
 
       function handler(err, data) {
@@ -88,26 +90,35 @@ describe("#container", function() {
         done();
       }
 
-      container.getArchive({
-        'path': '/var/log/dmesg'
+      container.infoArchive({
+        'path': '/root/Dockerfile'
       }, handler);
     });
+  });
+
+  describe("#start", function() {
+    it("should start a container", function(done) {
+      this.timeout(60000);
 
-    it("should put an archive inside the container", function(done) {
       var container = docker.getContainer(testContainer);
 
       function handler(err, data) {
         expect(err).to.be.null;
-        expect(data).to.be.ok;
         done();
       }
 
-      container.putArchive('./test/test.tar', {
-        'path': '/root'
-      }, handler);
+      container.start(handler);
     });
+  });
 
-    it("should inspect an archive inside the container", function(done) {
+  describe("#checkpoints", function() {
+    before(function() {
+      if(process.platform === 'darwin') {
+        this.skip();
+      }
+    });
+
+    it("should create container checkpoint", function(done) {
       var container = docker.getContainer(testContainer);
 
       function handler(err, data) {
@@ -116,24 +127,21 @@ describe("#container", function() {
         done();
       }
 
-      container.infoArchive({
-        'path': '/root/Dockerfile'
+      container.createCheckpoint({
+        'checkpointID': 'testCheckpoint'
       }, handler);
     });
-  });
-
-  describe("#start", function() {
-    it("should start a container", function(done) {
-      this.timeout(60000);
 
+    it("should list containers checkpoints", function(done) {
       var container = docker.getContainer(testContainer);
 
       function handler(err, data) {
         expect(err).to.be.null;
+        expect(data).to.be.ok;
         done();
       }
 
-      container.start(handler);
+      container.listCheckpoint(handler);
     });
   });
 

diff --git a/test/plugin.js b/test/plugin.js
@@ -47,24 +47,29 @@ describe("#plugin", function() {
           'remote': 'vieux/sshfs'
         },
         '_body': [{
-            'Name': 'network',
-            'Description': 'permissions to access a network',
-            'Value': ['host']
+            Name: 'network',
+            Description: 'permissions to access a network',
+            Value: ['host']
           },
           {
-            'Name': 'mount',
-            'Description': 'host path to mount',
-            'Value': ['/var/lib/docker/plugins/']
+            Name: 'mount',
+            Description: 'host path to mount',
+            Value: ['/var/lib/docker/plugins/']
           },
           {
-            'Name': 'device',
-            'Description': 'host device to access',
-            'Value': ['/dev/fuse']
+            Name: 'mount',
+            Description: 'host path to mount',
+            Value: ['']
           },
           {
-            'Name': 'capabilities',
-            'Description': 'list of additional capabilities required',
-            'Value': ['CAP_SYS_ADMIN']
+            Name: 'device',
+            Description: 'host device to access',
+            Value: ['/dev/fuse']
+          },
+          {
+            Name: 'capabilities',
+            Description: 'list of additional capabilities required',
+            Value: ['CAP_SYS_ADMIN']
           }
         ]
       }, function(err, stream) {