diff --git a/jetstream/tests/jscluster_test.ts b/jetstream/tests/jscluster_test.ts index a43e4a27..3594da7b 100644 --- a/jetstream/tests/jscluster_test.ts +++ b/jetstream/tests/jscluster_test.ts @@ -1,5 +1,12 @@ import { jetstream, jetstreamManager } from "../src/jsclient.ts"; -import { connect, flakyTest, NatsServer, notCompatible } from "test_helpers"; +import { + cleanup, + connect, + flakyTest, + jetstreamServerConf, + NatsServer, + notCompatible, +} from "test_helpers"; import { DiscardPolicy, RetentionPolicy, @@ -15,7 +22,6 @@ import { assertRejects, fail, } from "jsr:@std/assert"; -import { cleanup, jetstreamServerConf } from "../../test_helpers/mod.ts"; Deno.test("jetstream - mirror alternates", async () => { const servers = await NatsServer.jetstreamCluster(3); diff --git a/jetstream/tests/pushconsumers_ordered_test.ts b/jetstream/tests/pushconsumers_ordered_test.ts index 2236f589..2fe6ee73 100644 --- a/jetstream/tests/pushconsumers_ordered_test.ts +++ b/jetstream/tests/pushconsumers_ordered_test.ts @@ -21,6 +21,7 @@ import { _setup, cleanup, connect, + flakyTest, jetstreamServerConf, notCompatible, } from "test_helpers"; @@ -30,7 +31,6 @@ import type { } from "../src/pushconsumer.ts"; import { delay } from "@nats-io/nats-core/internal"; import type { NatsConnectionImpl } from "@nats-io/nats-core/internal"; -import { flakyTest } from "../../test_helpers/mod.ts"; Deno.test("ordered push consumers - get", async () => { const { ns, nc } = await _setup(connect, jetstreamServerConf()); diff --git a/jetstream/tests/streams_test.ts b/jetstream/tests/streams_test.ts index 25eb68d1..0efbb968 100644 --- a/jetstream/tests/streams_test.ts +++ b/jetstream/tests/streams_test.ts @@ -13,7 +13,13 @@ * limitations under the License. */ -import { connect, notCompatible } from "test_helpers"; +import { + _setup, + cleanup, + connect, + jetstreamServerConf, + notCompatible, +} from "test_helpers"; import { AckPolicy, jetstream, jetstreamManager } from "../src/mod.ts"; import { @@ -21,7 +27,6 @@ import { assertExists, assertRejects, } from "https://deno.land/std@0.221.0/assert/mod.ts"; -import { _setup, cleanup, jetstreamServerConf } from "test_helpers"; import { initStream } from "./jstest_util.ts"; import type { NatsConnectionImpl } from "@nats-io/nats-core/internal"; diff --git a/jetstream/tests/util.ts b/jetstream/tests/util.ts index c6351c4c..fea26e5f 100644 --- a/jetstream/tests/util.ts +++ b/jetstream/tests/util.ts @@ -14,8 +14,8 @@ */ import { delay } from "@nats-io/nats-core"; -import { fail } from "node:assert"; import type { Consumer, Stream } from "../src/types.ts"; +import { fail } from "jsr:@std/assert"; import { StreamImpl } from "../src/jsmstream_api.ts"; import { JetStreamApiCodes, JetStreamApiError } from "../src/jserrors.ts"; diff --git a/test_helpers/mod.ts b/test_helpers/mod.ts index 2b73040f..93c28da9 100644 --- a/test_helpers/mod.ts +++ b/test_helpers/mod.ts @@ -22,7 +22,6 @@ import { compare, extend, parseSemVer } from "../core/src/internal_mod.ts"; import { NatsServer } from "./launcher.ts"; import { red, yellow } from "jsr:@std/fmt/colors"; import { connect } from "./connect.ts"; -export { connect } from "./connect.ts"; import { ConnectFn } from "../core/src/core.ts"; export { check } from "./check.ts"; export { Lock } from "./lock.ts";