Merge branch '2.3' into develop

maxctrl/test/alter.js

@@ -108,5 +108,17 @@ describe("Alter Commands", function() {
             .should.be.rejected
     })
 
+    it('creates user', function() {
+        return verifyCommand('create user testuser test', 'users/inet/testuser')
+    })
+
+    it('alters the password of a user', function() {
+        return verifyCommand('alter user testuser test2', 'users/inet/testuser')
+    })
+
+    it('destroys the altered user', function() {
+        return doCommand('destroy user testuser')
+    })
+
     after(stopMaxScale)
 });

maxctrl/test/createdestroy.js

@@ -18,6 +18,18 @@ describe("Create/Destroy Commands", function() {
             .should.be.rejected
     })
 
+    it('monitor without parameters fails due to missing user parameter', function() {
+        return verifyCommand('create monitor my-monitor mysqlmon', 'monitors/my-monitor')
+            .should.be.rejected
+    })
+
+    it('destroy monitor created without parameters', function() {
+        return doCommand('destroy monitor my-monitor')
+            .should.be.fulfilled
+            .then(() => doCommand('show monitor my-monitor'))
+            .should.be.rejected
+    })
+
     it('will not destroy the same monitor again', function() {
         return doCommand('destroy monitor my-monitor')
             .should.be.rejected
@@ -38,6 +50,11 @@ describe("Create/Destroy Commands", function() {
             .should.be.rejected
     })
 
+    it('will not create monitor with malformed parameters', function() {
+        return doCommand('create monitor my-monitor mariadbmon not-a-param')
+            .should.be.rejected
+    })
+
     it('create monitor with options', function() {
         return doCommand('unlink monitor MariaDB-Monitor server4')
             .then(() => verifyCommand('create monitor my-monitor mysqlmon --servers server4 --monitor-user maxuser --monitor-password maxpwd',

maxctrl/test/drain.js

@@ -15,5 +15,10 @@ describe("Draining servers", function() {
             .should.eventually.have.string("Maintenance")
     })
 
+    it('does not drain non-existent server', function() {
+        return doCommand('drain server not-a-server')
+            .should.be.rejected
+    })
+
     after(stopMaxScale)
 });

maxctrl/test/unknown.js

@@ -19,7 +19,8 @@ describe("Unknown Commands", function() {
         'alter',
         'rotate',
         'call',
-        'cluster'
+        'cluster',
+        'drain'
     ]
 
     endpoints.forEach(function (i) {