Skip to content

Commit 4d7366d

Browse files
luck3yluck3y
authored
Merge pull request #245 from jfdenise/test-eap-ds
Remove mysql based tests that we can't run anymore
2 parents efeabce + 98a925a commit 4d7366d

File tree

1 file changed

+1
-60
lines changed

1 file changed

+1
-60
lines changed

‎tests/features/datasource.feature‎

Lines changed: 1 addition & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -764,30 +764,7 @@ Feature: EAP Openshift datasources
764764
| JDBC_SKIP_RECOVERY | true |
765765
| EE_DEFAULT_DATASOURCE | does-not-match-anything |
766766
Then container log should contain ERROR The list of configured datasources does not contain a datasource matching the ee default-bindings datasource specified with EE_DEFAULT_DATASOURCE='does-not-match-anything'.
767-
@Ignore
768-
# no more mysql in DB feature-pack, and we can't replace by oracle, mysql has spcial support in launch scripts.
769-
Scenario: check mysql datasource, galleon s2i
770-
Given s2i build git://github.com/jboss-container-images/jboss-eap-modules from tests/examples/test-app-prov-mysql with env and true
771-
| variable | value |
772-
| DB_SERVICE_PREFIX_MAPPING | test-mysql=TEST |
773-
| TEST_DATABASE | kitchensink |
774-
| TEST_USERNAME | marek |
775-
| TEST_PASSWORD | hardtoguess |
776-
| TEST_MYSQL_SERVICE_HOST | 10.1.1.1 |
777-
| TEST_MYSQL_SERVICE_PORT | 3306 |
778-
| JDBC_SKIP_RECOVERY | true |
779-
Then container log should contain WFLYSRV0025
780-
Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value java:jboss/datasources/test_mysql on XPath //*[local-name()='xa-datasource']/@jndi-name
781-
Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value test_mysql-TEST on XPath //*[local-name()='xa-datasource']/@pool-name
782-
Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain trimmed value 10.1.1.1 on XPath //*[local-name()='xa-datasource-property'][@name="ServerName"]
783-
Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain trimmed value 3306 on XPath //*[local-name()='xa-datasource-property'][@name="Port"]
784-
Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain trimmed value kitchensink on XPath //*[local-name()='xa-datasource-property'][@name="DatabaseName"]
785-
Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value marek on XPath //*[local-name()='xa-datasource']/*[local-name()='security']/*[local-name()='user-name']
786-
Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value hardtoguess on XPath //*[local-name()='xa-datasource']/*[local-name()='security']/*[local-name()='password']
787-
# EE default bindings
788-
Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value java:jboss/datasources/test_mysql on XPath //*[local-name()='default-bindings']/@datasource
789-
And container log should not contain WARN The default datasource for the ee subsystem has been guessed to be
790-
767+
791768
Scenario: check postgresql datasource, galleon s2i
792769
Given s2i build git://github.com/jboss-container-images/jboss-eap-modules from tests/examples/test-app-postgres with env and true
793770
| variable | value |
@@ -811,42 +788,6 @@ Feature: EAP Openshift datasources
811788
Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value java:jboss/datasources/test_postgresql on XPath //*[local-name()='default-bindings']/@datasource
812789
And container log should not contain WARN The default datasource for the ee subsystem has been guessed to be
813790

814-
@Ignore
815-
# no more mysql in DB feature-pack, and we can't replace by oracle, mysql has spcial support in launch scripts.
816-
Scenario: check mysql and postgresql datasource, galleon s2i
817-
Given s2i build git://github.com/jboss-container-images/jboss-eap-modules from tests/examples/test-app-prov-mysql-postgres with env and true
818-
| variable | value |
819-
| DB_SERVICE_PREFIX_MAPPING | test-postgresql=TEST_POSTGRESQL,test-mysql=TEST_MYSQL |
820-
| TEST_MYSQL_DATABASE | kitchensink-m |
821-
| TEST_MYSQL_USERNAME | marek-m |
822-
| TEST_MYSQL_PASSWORD | hardtoguess-m |
823-
| TEST_MYSQL_SERVICE_HOST | 10.1.1.1 |
824-
| TEST_MYSQL_SERVICE_PORT | 3306 |
825-
| TEST_POSTGRESQL_DATABASE | kitchensink-p |
826-
| TEST_POSTGRESQL_USERNAME | marek-p |
827-
| TEST_POSTGRESQL_PASSWORD | hardtoguess-p |
828-
| TEST_POSTGRESQL_SERVICE_HOST | 10.1.1.2 |
829-
| TEST_POSTGRESQL_SERVICE_PORT | 5432 |
830-
| JDBC_SKIP_RECOVERY | true |
831-
Then container log should contain WFLYSRV0025
832-
Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value java:jboss/datasources/test_postgresql on XPath //*[local-name()='xa-datasource']/@jndi-name
833-
Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value test_postgresql-TEST_POSTGRESQL on XPath //*[local-name()='xa-datasource']/@pool-name
834-
Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain trimmed value 10.1.1.1 on XPath //*[local-name()='xa-datasource']/*[local-name()='xa-datasource-property'][@name="ServerName"]
835-
Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain trimmed value 5432 on XPath //*[local-name()='xa-datasource']/*[local-name()='xa-datasource-property'][@name="PortNumber"]
836-
Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain trimmed value kitchensink-p on XPath //*[local-name()='xa-datasource']/*[local-name()='xa-datasource-property'][@name="DatabaseName"]
837-
Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value marek-p on XPath //*[local-name()='xa-datasource']/*[local-name()='security']/*[local-name()='user-name']
838-
Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value hardtoguess-p on XPath //*[local-name()='xa-datasource']/*[local-name()='security']/*[local-name()='password']
839-
Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value java:jboss/datasources/test_mysql on XPath //*[local-name()='xa-datasource']/@jndi-name
840-
Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value test_mysql-TEST_MYSQL on XPath //*[local-name()='xa-datasource']/@pool-name
841-
Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain trimmed value 10.1.1.2 on XPath //*[local-name()='xa-datasource']/*[local-name()='xa-datasource-property'][@name="ServerName"]
842-
Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain trimmed value 3306 on XPath //*[local-name()='xa-datasource']/*[local-name()='xa-datasource-property'][@name="Port"]
843-
Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain trimmed value kitchensink-m on XPath //*[local-name()='xa-datasource']/*[local-name()='xa-datasource-property'][@name="DatabaseName"]
844-
Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value marek-m on XPath //*[local-name()='xa-datasource']/*[local-name()='security']/*[local-name()='user-name']
845-
Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value hardtoguess-m on XPath //*[local-name()='xa-datasource']/*[local-name()='security']/*[local-name()='password']
846-
# EE default bindings
847-
Then XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value java:jboss/datasources/test_postgresql on XPath //*[local-name()='default-bindings']/@datasource
848-
And container log should contain WARN The default datasource for the ee subsystem has been guessed to be java:jboss/datasources/test_postgresql. Specify this using EE_DEFAULT_DATASOURCE
849-
850791
Scenario: check that exampleDS is not generated by default, galleon s2i
851792
Given s2i build git://github.com/openshift/openshift-jee-sample from . with env and true using master
852793
| variable | value |

0 commit comments

Comments
 (0)