Skip to content

Commit da2d815

Browse files
random port in run_back & run_viewer
1 parent e578e80 commit da2d815

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

tests/integration/setup.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import Status from "~/utils/status"
2121
import {
2222
executable_name,
2323
executable_path,
24-
get_available_port,
2524
run_back,
2625
run_viewer,
2726
} from "~/utils/local"
@@ -51,16 +50,12 @@ async function setupIntegrationTests(file_name, geode_object, object_type) {
5150
executable_path(path.join(microservices_path, "viewer")),
5251
executable_name("opengeodeweb-viewer"),
5352
)
54-
const b_port = await get_available_port()
55-
const v_port = await get_available_port()
5653
const [back_port, viewer_port] = await Promise.all([
5754
run_back(back_path, {
58-
port: b_port,
5955
project_folder_path: project_folder_path,
6056
upload_folder_path: upload_folder_path,
6157
}),
6258
run_viewer(viewer_path, {
63-
port: v_port,
6459
project_folder_path: project_folder_path,
6560
}),
6661
])

utils/local.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -110,36 +110,37 @@ async function run_script(
110110

111111
async function run_back(
112112
command,
113-
args = { port, project_folder_path, upload_folder_path: null },
113+
args = { project_folder_path, upload_folder_path: null },
114114
) {
115-
console.log("run_back", command, args)
116115
return new Promise(async (resolve, reject) => {
117116
if (args.upload_folder_path === null) {
118117
args.upload_folder_path = path.join(args.project_folder_path, "uploads")
119118
}
119+
const port = await get_available_port()
120120
const back_args = [
121-
"--port " + args.port,
121+
"--port " + port,
122122
"--data_folder_path " + args.project_folder_path,
123123
"--upload_folder_path " + args.upload_folder_path,
124124
"--allowed_origin http://localhost:*",
125125
"--timeout " + 0,
126126
]
127127
console.log("run_back", command, back_args)
128128
await run_script(command, back_args, "Serving Flask app")
129-
resolve(args.port)
129+
resolve(port)
130130
})
131131
}
132132

133-
async function run_viewer(command, args = { port, project_folder_path }) {
133+
async function run_viewer(command, args = { project_folder_path }) {
134134
return new Promise(async (resolve, reject) => {
135+
const port = await get_available_port()
135136
const viewer_args = [
136-
"--port " + args.port,
137+
"--port " + port,
137138
"--data_folder_path " + args.project_folder_path,
138139
"--timeout " + 0,
139140
]
140141
console.log("run_viewer", command, viewer_args)
141142
await run_script(command, viewer_args, "Starting factory")
142-
resolve(args.port)
143+
resolve(port)
143144
})
144145
}
145146

@@ -222,8 +223,8 @@ function kill_viewer(viewer_port) {
222223
async function run_browser(
223224
script_name,
224225
microservices_options = {
225-
back: { command, args: { port: 5000, data_folder_path } },
226-
viewer: { command, args: { port: 1234, data_folder_path } },
226+
back: { command, args: { data_folder_path } },
227+
viewer: { command, args: { data_folder_path } },
227228
},
228229
) {
229230
console.log("microservices_options", microservices_options)

0 commit comments

Comments
 (0)