Skip to content

Commit

Permalink
update integration test check
Browse files Browse the repository at this point in the history
  • Loading branch information
Luke-Roy-IBM committed Jul 21, 2023
1 parent 7882959 commit 394607f
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 8 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ jobs:
pip3 --version
pip3.10 --version
- name: Is PR
run: if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_REPO_SLUG" = "ibm-functions/runtime-nodejs" ]; then echo credTest; else echo noCredTest; fi

- name: befor install -> setup.sh
run: |
./tools/travis/setup.sh
Expand Down
4 changes: 2 additions & 2 deletions tests/dat/cloudant/testCloudantAction.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const isNodeJS8 = nodeRuntime === 'nodejs8' ? true : false

if (process.version.startsWith('v8.')) {
var Cloudant = require("cloudant")
} else if (process.version.startsWith('v16.') || process.version.startsWith('v20.')) {
} else if (process.version.startsWith('v16.') || process.version.startsWith('v18.')) {
console.log("------------------------- require @ibm-cloud/cloudant ----------------------");
var { CloudantV1 } = require('@ibm-cloud/cloudant');
} else {
Expand All @@ -17,7 +17,7 @@ function main(args){
var url = args.url;
var dbName = `test_cloud_functions_nodejs_${nodeRuntime}_ibm_runtime`

if (process.version.startsWith('v16.') || process.version.startsWith('v20.')) {
if (process.version.startsWith('v16.') || process.version.startsWith('v18.')) {
process.env['CLOUDANT_AUTH_TYPE'] = 'BASIC'
process.env['CLOUDANT_URL'] = url
process.env['CLOUDANT_USERNAME'] = username
Expand Down
4 changes: 2 additions & 2 deletions tests/dat/cloudant/testCloudantActionNoCreds.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
if (process.version.startsWith('v8.')) {
var Cloudant = require("cloudant")
} else if (process.version.startsWith('v16.') || process.version.startsWith('v20.')) {
} else if (process.version.startsWith('v16.') || process.version.startsWith('v18.')) {
var { CloudantV1 } = require('@ibm-cloud/cloudant');
} else {
var Cloudant = require("@cloudant/cloudant")
}


function main(args){
if (process.version.startsWith('v16.') || process.version.startsWith('v20.')) {
if (process.version.startsWith('v16.') || process.version.startsWith('v18.')) {
try {
var { CloudantV1 } = require('@ibm-cloud/cloudant');
var version = require('@ibm-cloud/cloudant').version
Expand Down
2 changes: 1 addition & 1 deletion tests/dat/db2/testdb2action.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var ibmdb = require('ibm_db');

function main(args){

if (process.version.startsWith('v16.') || process.version.startsWith('v20.')) {
if (process.version.startsWith('v16.') || process.version.startsWith('v18.')) {
return ibmdb.open(`DATABASE=TEST;HOSTNAME=${args.hostname};UID=db2inst1;PWD=db2inst1-pwd;PORT=50000;PROTOCOL=TCPIP`).then((conn) => {
connection = conn;
return connection.query("INSERT INTO TESTTABLE (NAME, AGE, LOCATION) VALUES ('Angela', 27, 'Texas')");
Expand Down

0 comments on commit 394607f

Please sign in to comment.