Skip to content

Commit a88cac3

Browse files
committed
update wait strategy and test shared package
1 parent b51e6ae commit a88cac3

File tree

7 files changed

+63
-11
lines changed

7 files changed

+63
-11
lines changed

.yarnrc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nodeLinker: node-modules

packages/cubejs-testing-shared/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "@cubejs-backend/testing-shared",
2+
"name": "@knowitall/testing-shared",
33
"version": "1.1.8",
44
"description": "Cube.js Testing Helpers",
55
"author": "Cube Dev, Inc.",

packages/cubejs-testing-shared/src/db-container-runners/vertica.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { GenericContainer } from 'testcontainers';
2-
import { LogWaitStrategy } from 'testcontainers/build/wait-strategies/log-wait-strategy';
1+
import { GenericContainer, Wait } from 'testcontainers';
32
import { DbRunnerAbstract } from './db-runner.abstract';
43

54
export class VerticaDBRunner extends DbRunnerAbstract {
@@ -10,7 +9,9 @@ export class VerticaDBRunner extends DbRunnerAbstract {
109
.withEnvironment({ TZ: 'Antarctica/Troll', VERTICA_DB_NAME: 'test' })
1110
.withExposedPorts(5433)
1211
.withStartupTimeout(60 * 1000)
13-
.withWaitStrategy(new LogWaitStrategy('Node Status: v_test_node0001: (UP)', 1));
12+
.withWaitStrategy(
13+
Wait.forLogMessage('Node Status: v_test_node0001: (UP)')
14+
);
1415

1516
return container.start();
1617
}

packages/cubejs-testing/test/smoke-vertica.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import fetch from 'node-fetch';
22
import { StartedTestContainer } from 'testcontainers';
33
// eslint-disable-next-line import/no-extraneous-dependencies
4-
import { VerticaDBRunner } from '@cubejs-backend/testing-shared';
4+
import { VerticaDBRunner } from '@knowitall/testing-shared';
55
import cubejs, { CubeApi, Query } from '@cubejs-client/core';
66
import { afterAll, beforeAll, expect, jest } from '@jest/globals';
77
import { BirdBox, getBirdbox } from '../src';

packages/cubejs-vertica-driver/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
"lint:fix": "eslint --fix **/*.js"
2020
},
2121
"dependencies": {
22-
"@cubejs-backend/query-orchestrator": "^0.36.0",
23-
"@cubejs-backend/schema-compiler": "^0.36.0",
22+
"@cubejs-backend/query-orchestrator": "1.1.8",
23+
"@cubejs-backend/schema-compiler": "1.1.8",
2424
"moment-timezone": "^0.5.45",
2525
"vertica-nodejs": "^1.0.3"
2626
},
2727
"license": "Apache-2.0",
2828
"devDependencies": {
29-
"@cubejs-backend/linter": "^0.36.0",
30-
"@cubejs-backend/testing-shared": "^0.36.0",
29+
"@cubejs-backend/linter": "^1.0.0",
30+
"@knowitall/testing-shared": "1.1.8",
3131
"jest": "^27.5.1",
3232
"testcontainers": "^10.13.0"
3333
},

packages/cubejs-vertica-driver/test/VerticaDriver.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* globals describe, afterAll, beforeAll, test, expect, jest */
2-
const { VerticaDBRunner } = require('@cubejs-backend/testing-shared');
2+
const { VerticaDBRunner } = require('@knowitall/testing-shared');
33
const VerticaDriver = require('../src/VerticaDriver.js');
44

55
describe('VerticaDriver', () => {

yarn.lock

Lines changed: 51 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4401,6 +4401,20 @@
44014401
throttle-debounce "^3.0.1"
44024402
uuid "^8.3.2"
44034403

4404+
"@cubejs-backend/[email protected]":
4405+
version "1.1.8"
4406+
resolved "https://registry.npmjs.org/@cubejs-backend/testing-shared/-/testing-shared-1.1.8.tgz#2a8b2c7c5ae16d311980f6198f85586f067f7555"
4407+
integrity sha512-Gq1n+Q85aoQyn5/STitWpLh3243tQWBId3C+52HTAVdbaHGKJMm05G7O5EXLFt7Nc5NGHBROP2WTOCkkoxTNoQ==
4408+
dependencies:
4409+
"@cubejs-backend/dotenv" "^9.0.2"
4410+
"@cubejs-backend/query-orchestrator" "1.1.8"
4411+
"@cubejs-backend/schema-compiler" "1.1.8"
4412+
"@cubejs-backend/shared" "1.1.8"
4413+
"@testcontainers/kafka" "~10.13.0"
4414+
dedent "^0.7.0"
4415+
node-fetch "^2.6.7"
4416+
testcontainers "^10.13.0"
4417+
44044418
"@cubejs-infra/post-installer@^0.0.7":
44054419
version "0.0.7"
44064420
resolved "https://registry.yarnpkg.com/@cubejs-infra/post-installer/-/post-installer-0.0.7.tgz#a28d2d03e5b7b69a64020d75194a7078cf911d2d"
@@ -19513,7 +19527,7 @@ jest-worker@^28.0.2:
1951319527
merge-stream "^2.0.0"
1951419528
supports-color "^8.0.0"
1951519529

19516-
jest@27, jest@^27, jest@^27.1.0:
19530+
jest@27, jest@^27, jest@^27.1.0, jest@^27.5.1:
1951719531
version "27.5.1"
1951819532
resolved "https://registry.yarnpkg.com/jest/-/jest-27.5.1.tgz#dadf33ba70a779be7a6fc33015843b51494f63fc"
1951919533
integrity sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==
@@ -21361,6 +21375,13 @@ moment-timezone@^0.5.15, moment-timezone@^0.5.27, moment-timezone@^0.5.31, momen
2136121375
dependencies:
2136221376
moment "^2.29.4"
2136321377

21378+
moment-timezone@^0.5.45:
21379+
version "0.5.46"
21380+
resolved "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.46.tgz#a21aa6392b3c6b3ed916cd5e95858a28d893704a"
21381+
integrity sha512-ZXm9b36esbe7OmdABqIWJuBBiLLwAjrN7CE+7sYdCCx82Nabt1wHDj8TVseS59QIlfFPbOoiBPm6ca9BioG4hw==
21382+
dependencies:
21383+
moment "^2.29.4"
21384+
2136421385
moment@^2.17.1, moment@^2.24.0, moment@^2.25.3, moment@^2.29.1, moment@^2.29.4:
2136521386
version "2.29.4"
2136621387
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
@@ -28896,6 +28917,21 @@ uuid@^9.0.0, uuid@^9.0.1:
2889628917
resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
2889728918
integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
2889828919

28920+
28921+
version "1.1.1"
28922+
resolved "https://registry.npmjs.org/v-connection-string/-/v-connection-string-1.1.1.tgz#db8d50473e276511320bfed742cdf8ed05d537b5"
28923+
integrity sha512-FqxtfwiMQekIqFMMXCDrrLbmGBEEHzm8HD0O2CZcCCQbBFsD+KaHkCRpkLE1j+bBWreYfeI1b0MjzGHNx9Bs1w==
28924+
28925+
28926+
version "1.1.4"
28927+
resolved "https://registry.npmjs.org/v-pool/-/v-pool-1.1.4.tgz#a65e5e15e06f6c4a642b389d264d67ae8ae6afd8"
28928+
integrity sha512-qJiYI40fibbKUWT3zonUHlG32qqvyZ5ya0YJduRogLBXQAEJhwvA5Kaw0gFg2uEMLjTBEY9QkP+w7uhU2I+zTA==
28929+
28930+
28931+
version "1.1.1"
28932+
resolved "https://registry.npmjs.org/v-protocol/-/v-protocol-1.1.1.tgz#03a817757326c16ae5f54dcab14b196d01d594f3"
28933+
integrity sha512-HkIPshuFEK0awxmLN2ECTzBqncxDSBjzJ2U89u3BhykNSJ8uumYj9g74l59i2K/2lRO5t0gm40iUHuJkpEnvGw==
28934+
2889928935
v8-compile-cache@^2.0.3:
2890028936
version "2.3.0"
2890128937
resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
@@ -28949,6 +28985,20 @@ [email protected]:
2894928985
core-util-is "1.0.2"
2895028986
extsprintf "^1.2.0"
2895128987

28988+
vertica-nodejs@^1.0.3:
28989+
version "1.1.4"
28990+
resolved "https://registry.npmjs.org/vertica-nodejs/-/vertica-nodejs-1.1.4.tgz#9df8c9f7f39b9067d518cec0f19f78fbd51b08f8"
28991+
integrity sha512-4nMNNjOQvImakYnN253SYYpkyvO2dx25ILlEbgMhZqx7yEOzCCxq8Ekh4VbPj1T6bCzR+3nQGKtAgy1wER3F/A==
28992+
dependencies:
28993+
buffer-writer "2.0.0"
28994+
glob "^7.1.6"
28995+
packet-reader "1.0.0"
28996+
pg-types "^2.1.0"
28997+
pgpass "1.x"
28998+
v-connection-string "1.1.1"
28999+
v-pool "1.1.4"
29000+
v-protocol "1.1.1"
29001+
2895229002
victory-vendor@^36.6.8:
2895329003
version "36.9.2"
2895429004
resolved "https://registry.yarnpkg.com/victory-vendor/-/victory-vendor-36.9.2.tgz#668b02a448fa4ea0f788dbf4228b7e64669ff801"

0 commit comments

Comments
 (0)