Merge pull request #268 from CloudSlang/re-add-monitor-mysql

remove ignore from test mysql monitor
CloudSlang · Jul 26, 2015 · 2dcf868 · 2dcf868
2 parents c30a421 + 3ebbcc3
commit 2dcf868
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/content/io/cloudslang/docker/monitoring/mysql/check_mysql_is_up.sl b/content/io/cloudslang/docker/monitoring/mysql/check_mysql_is_up.sl
@@ -51,7 +51,7 @@ flow:
     - private_key_file:
         required: false
     - exec_cmd:
-        default: "'mysqladmin -u' + mysql_username + ' -p' + mysql_password + ' ping'"
+        default: "'mysqladmin -u' + mysql_username + ' -p' + mysql_password + ' --protocol=tcp ping'"
         overridable: false
     - command:
         default: "'docker exec ' + container + ' ' + exec_cmd"

diff --git a/content/io/cloudslang/docker/monitoring/mysql/get_mysql_status.sl b/content/io/cloudslang/docker/monitoring/mysql/get_mysql_status.sl
@@ -55,7 +55,7 @@ flow:
     - mysql_username
     - mysql_password
     - exec_cmd:
-        default: "'mysqladmin -u' + mysql_username + ' -p' + mysql_password + ' status'"
+        default: "'mysqladmin -u' + mysql_username + ' -p' + mysql_password + ' --protocol=tcp status'"
         overridable: false
     - command:
         default: "'docker exec ' + container + ' ' + exec_cmd"

diff --git a/test/io/cloudslang/docker/monitoring/mysql/test_mysql_monitor.inputs.yaml b/test/io/cloudslang/docker/monitoring/mysql/test_mysql_monitor.inputs.yaml
@@ -7,7 +7,7 @@
 #
 ####################################################
 testDocker_test_mysql_monitor:
-  testSuites: [docker,docker-misc-ignore]
+  testSuites: [docker,docker-misc]
   description: Tests the operation that monitor a mysql container.
   testFlowPath: io.cloudslang.docker.monitoring.mysql.test_mysql_monitor
   inputs: