Skip to content

Commit 2de8137

Browse files
committed
Disable verify goal and e2e error message changes
1 parent f31af7e commit 2de8137

File tree

8 files changed

+20
-20
lines changed

8 files changed

+20
-20
lines changed

cloudsql-mysql-plugin/src/e2e-test/resources/errorMessage.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
errorMessageInvalidSourceDatabase=SQL error while getting query schema
1+
errorMessageInvalidSourceDatabase=SQL Error occurred, sqlState: '42000', errorCode: '1049'
22
errorMessageInvalidImportQuery=Import Query select must contain the string '$CONDITIONS'. if Number of Splits is not set\
33
\ to 1. Include '$CONDITIONS' in the Import Query
44
errorMessageCloudMySqlInvalidReferenceName=Invalid reference name
55
errorMessageBlankUsername=Username is required when password is given.
6-
errorMessageBlankPassword=SQL error while getting query schema
6+
errorMessageBlankPassword=SQL Error occurred, sqlState: '28000', errorCode: '1045', errorMessage: SQL Exception occurred:
77
errorMessageInvalidFetchSize=Invalid fetch size. Fetch size must be a positive integer.
88
errorMessageBlankSplitBy=Split-By Field Name must be specified if Number of Splits is not set to 1. Specify the Split-by Field Name.
99
errorMessageInvalidNumberOfSplits=Invalid value for Number of Splits '0'. Must be at least 1. Specify a Number of Splits no less than 1.
@@ -12,7 +12,7 @@ errorMessageNumberOfSplits=Split-By Field Name must be specified if Number of Sp
1212
errorMessageBoundingQuery=Bounding Query must be specified if Number of Splits is not set to 1. Specify the Bounding Query.
1313
errorMessageInvalidSinkDatabase=Error encountered while configuring the stage: 'URLDecoder: Illegal hex characters in escape (%) pattern - For input string: "$^"'
1414
errorMessageInvalidTableName=Table 'Invalidtable' does not exist. Ensure table 'Invalidtable' is set correctly and
15-
errorMessageConnectionName=Connection Name must be in the format <PROJECT_ID>:<REGION>:<INSTANCE_NAME> to connect to a public CloudSQL PostgreSQL instance.
15+
errorMessageConnectionName=Connection Name must be in the format <PROJECT_ID>:<REGION>:<INSTANCE_NAME> to connect to a public CloudSQL MySQL instance.
1616
validationSuccessMessage=No errors found.
1717
validationErrorMessage=COUNT ERROR found
1818
errorLogsMessageInvalidTableName=Spark program 'phase-1' failed with error: Errors were encountered during validation. \

cloudsql-postgresql-plugin/src/e2e-test/resources/errorMessage.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ errorMessageBlankPassword=SQL error while getting query schema:
1515
errorMessageInvalidPassword=SQL error while getting query schema: FATAL: password authentication failed for user
1616
errorMessageInvalidSourceHost=SQL error while getting query schema: The connection attempt failed.
1717
errorMessageInvalidTableName=Table 'table' does not exist. Ensure table '"table"' is set correctly and that the
18-
errorMessageInvalidSinkDatabase=Exception while trying to validate schema of database table
18+
errorMessageInvalidSinkDatabase=Error encountered while configuring the stage: 'SQL Error occurred, sqlState: '3D000', errorCode: '0',
1919
errorLogsMessageInvalidBoundingQuery=Spark program 'phase-1' failed with error: The column index is out of range: 1, \
2020
number of columns: 0.. Please check the system logs for more details.
2121
errorMessageConnectionName=Connection Name must be in the format <PROJECT_ID>:<REGION>:<INSTANCE_NAME> to connect to \

mssql-plugin/src/e2e-test/resources/errorMessage.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
validationSuccessMessage=No errors found.
2-
errorMessageInvalidSourceDatabase=SQL error while getting query schema
2+
errorMessageInvalidSourceDatabase=SQL Error occurred, sqlState: 'S0001', errorCode: '4060',
33
errorMessageInvalidImportQuery=Import Query select must contain the string '$CONDITIONS'.
44
errorMessageMssqlInvalidReferenceName=Invalid reference name 'invalidRef&^*&&*'.
55
errorMessageBlankUsername=Username is required when password is given.
6-
errorMessageBlankPassword=SQL error while getting query schema
6+
errorMessageBlankPassword=SQL Error occurred, sqlState: 'S0001', errorCode: '18456',
77
errorMessageInvalidFetchSize=Invalid fetch size. Fetch size must be a positive integer.
88
errorMessageBlankSplitBy=Split-By Field Name must be specified if Number of Splits is not set to 1.
99
errorMessageInvalidNumberOfSplits=Invalid value for Number of Splits '0'. Must be at least 1.
1010
errorMessageNumberOfSplitNotNumber=Unable to create config for batchsource
1111
errorMessageBoundingQuery=Bounding Query must be specified if Number of Splits is not set to 1.
1212
errorMessagenumofSplit=Split-By Field Name must be specified if Number of Splits is not set to 1.
13-
errorMessageInvalidSinkDatabase=Exception while trying to validate schema of database table
13+
errorMessageInvalidSinkDatabase=Error encountered while configuring the stage: 'SQL Error occurred, sqlState: 'S0001', errorCode: '4060',
1414
errorMessageInvalidSinkTableName=Table 'Table123@' does not exist.
15-
errormessageBlankHost=Exception while trying to validate schema of database table
15+
errormessageBlankHost=Error encountered while configuring the stage: 'SQL Error occurred, sqlState: '08S01', errorCode: '0',
1616
errorMessageInvalidTableName=Spark program 'phase-1' failed with error: Errors were encountered during validation. \
1717
Table 'Table123@' does not exist.. Please check the system logs for more details.
1818
errorMessageInvalidCredentials=Spark program 'phase-1' failed with error: Unable to create config for batchsink SqlServer \

mysql-plugin/src/e2e-test/resources/errorMessage.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ validationSuccessMessage=No errors found.
22
invalid.username.message=SQL error while getting query schema:
33
invalidtableName.error.message=Table '123#' does not exist. Ensure table '123#' is set correctly
44
invalidreferenceName.error.message=Invalid reference name
5-
invalid.host.message=Exception while trying to validate schema of database table
5+
invalid.host.message=Error encountered while configuring the stage: 'SQL Error occurred, sqlState: '08S01', errorCode: '0',
66
invalid.password.message=SQL error while getting query schema:
77
invalid.databasename.message=SQL error while getting query schema:
88
invalid.query.message=SQL error while getting query schema:
99
numberofsplits.error.message=Unable to create config for batchsource Mysql 'numSplits' is invalid
1010
boundingQuery.error.message=Bounding Query must be specified if Number of Splits is not set to 1.
1111
splitfield.error.message=Split-By Field Name must be specified if Number of Splits is not set to 1
12-
invalid.sink.database.message=Exception while trying to validate schema
12+
invalid.sink.database.message=Error encountered while configuring the stage: 'SQL Error occurred, sqlState: '42000', errorCode: '1049',
1313
blank.username.message=Username is required when password is given.

oracle-plugin/src/e2e-test/features/source/OracleRunTime.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ Feature: Oracle - Verify data transfer from Oracle source to BigQuery sink
296296
Then Close the Plugin Properties page
297297
Then Save the pipeline
298298
Then Preview and run the pipeline
299-
Then Wait till pipeline preview is in running state
299+
Then Wait till pipeline preview is in running state and check if any error occurs
300300
Then Verify the preview run status of pipeline in the logs is "failed"
301301

302302
@ORACLE_SOURCE_TEST @BQ_SINK_TEST

oracle-plugin/src/e2e-test/resources/errorMessage.properties

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@ errorMessageInvalidNumberOfSplits=Invalid value for Number of Splits '0'. Must b
77
errorMessageNumberOfSplitNotNumber=Unable to create config for batchsource Oracle 'numSplits' is invalid: Value of field\
88
\ class io.cdap.plugin.db.config.AbstractDBSpecificSourceConfig.numSplits is expected to be a number.
99
errorMessageInvalidFetchSize=Invalid fetch size. Fetch size must be a positive integer.
10-
errorMessageInvalidSourceDatabase=SQL error while getting query schema: Listener refused the connection with the following \
11-
error: ORA-12514, TNS:listener does not currently know of service requested in connect descriptor
10+
errorMessageInvalidSourceDatabase=SQL Error occurred, sqlState: '08006', errorCode: '12514',
1211
errorMessageInvalidImportQuery=Import Query select must contain the string '$CONDITIONS'. if Number of Splits is not set\
1312
\ to 1. Include '$CONDITIONS' in the Import Query
1413
errorMessageBlankUsername=Username is required when password is given.
15-
errorMessageInvalidTableName=Exception while trying to validate schema of database table '"table"' for connection
16-
errorMessageInvalidSinkDatabase=Exception while trying to validate schema of database table '"TARGETTABLE_
17-
errorMessageInvalidHost=Exception while trying to validate schema of database table '"table"' for connection
14+
errorMessageInvalidTableName=Error encountered while configuring the stage: 'SQL Error occurred, sqlState: '08006', errorCode: '17002',
15+
errorMessageInvalidSinkDatabase=Error encountered while configuring the stage: 'SQL Error occurred, sqlState: '08006', errorCode: '17002'
16+
errorMessageInvalidHost=Error encountered while configuring the stage: 'SQL Error occurred, sqlState: '08006', errorCode: '17002',
1817
errorLogsMessageInvalidBoundingQuery=Spark program 'phase-1' failed with error: ORA-00936: missing expression . \
1918
Please check the system logs for more details.

pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,8 @@
650650
<execution>
651651
<goals>
652652
<goal>integration-test</goal>
653-
<goal>verify</goal>
653+
<!-- Commented out verify goal to allow Cucumber reports to generate correctly even when tests fail-->
654+
<!-- <goal>verify</goal> -->
654655
</goals>
655656
</execution>
656657
</executions>
@@ -705,7 +706,7 @@
705706
<dependency>
706707
<groupId>io.cdap.tests.e2e</groupId>
707708
<artifactId>cdap-e2e-framework</artifactId>
708-
<version>0.3.0</version>
709+
<version>0.5.0-SNAPSHOT</version>
709710
<scope>test</scope>
710711
</dependency>
711712
<!-- https://mvnrepository.com/artifact/io.netty/netty-all -->

postgresql-plugin/src/e2e-test/resources/errorMessage.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ errorMessageBlankPassword=SQL error while getting query schema: The server reque
1616
errorMessageInvalidPassword=SQL error while getting query schema: FATAL: password authentication failed for user
1717
errorMessageInvalidSourceHost=SQL error while getting query schema: The connection attempt failed.
1818
errorMessageInvalidTableName=Table 'table' does not exist. Ensure table '"table"' is set correctly and that the
19-
errorMessageInvalidSinkDatabase=Exception while trying to validate schema of database table '"targettable_
20-
errorMessageInvalidHost=Exception while trying to validate schema of database table '"table"' for connection
19+
errorMessageInvalidSinkDatabase=Error encountered while configuring the stage: 'SQL Error occurred, sqlState: '3D000', errorCode: '0',
20+
errorMessageInvalidHost=Error encountered while configuring the stage: 'SQL Error occurred, sqlState: '08001', errorCode: '0',
2121
errorLogsMessageInvalidBoundingQuery=Spark program 'phase-1' failed with error: The column index is out of range: 1, \
2222
number of columns: 0.. Please check the system logs for more details.

0 commit comments

Comments
 (0)