Skip to content

Commit 930b1af

Browse files
aranegaaranega
committed
Merge branch 'development' of github.com:MetaCell/NetPyNE-UI into feature/Netpyne-172
2 parents 4f04375 + f899b70 commit 930b1af

14 files changed

Lines changed: 47 additions & 40 deletions

‎Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ RUN mkdir -p /opt/workspace
5353
RUN mkdir -p /opt/user
5454

5555

56-
57-
5856
ENV NEURON_HOME=/opt/conda
5957

6058

@@ -65,8 +63,10 @@ RUN jupyter nbextension enable --py --sys-prefix jupyter_geppetto
6563
RUN jupyter nbextension enable --py --sys-prefix widgetsnbextension
6664
RUN jupyter serverextension enable --py --sys-prefix jupyter_geppetto
6765

68-
RUN --mount=type=cache,target=/root/.cache python -m pip install --upgrade pip &&\
69-
python utilities/install.py --npm-skip --no-test
66+
ARG BUILD_ARGS=""
67+
ARG WORKSPACE_VERSION=master
68+
RUN --mount=type=cache,target=/root/.cache python -m pip install --upgrade pip &&\
69+
python utilities/install.py ${BUILD_ARGS} --workspace $WORKSPACE_VERSION
7070

7171

7272
RUN mv workspace /opt/workspace/tutorials

‎jupyter_hub/Dockerfile_spawner‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ RUN /bin/bash -c "INCUBATOR_VER=${INCUBATOR_VER} source activate snakes && pip i
1616
# Clone NetPyNE-UI and install the development version
1717
RUN wget https://github.com/MetaCell/NetPyNE-UI/archive/$netpyneuiBranch.zip -q
1818
RUN unzip $netpyneuiBranch.zip
19-
WORKDIR /home/jovyan/work/NetPyNE-UI-$netpyneuiBranch/utilities
19+
WORKDIR /opt/workspace-$netpyneuiBranch/utilities
2020
RUN /bin/bash -c "source activate snakes && python --version"
2121
RUN /bin/bash -c "source activate snakes && exec python install.py branch $netpyneuiBranch"
2222
WORKDIR /home/jovyan
2323
RUN git clone https://github.com/Neurosim-lab/netpyne_workspace
2424
WORKDIR /home/jovyan/workspace
25-
RUN ln -sfn /home/jovyan/work/NetPyNE-UI-$netpyneuiBranch/netpyne_ui/tests tests
25+
RUN ln -sfn /opt/workspace-$netpyneuiBranch/netpyne_ui/tests tests
2626

2727
# Copy jupyterhub_config
28-
# RUN cp /home/jovyan/work/NetPyNE-UI-$netpyneuiBranch/jupyterhub_config.py .
28+
# RUN cp /opt/workspace-$netpyneuiBranch/jupyterhub_config.py .
2929

3030
CMD /bin/bash -c "source activate snakes && exec jupyterhub-singleuser --debug --NotebookApp.default_url=/geppetto --NotebookApp.token='' --library=netpyne_ui"

‎k8s/cf_values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ hub:
1111
shutdownOnLogout: true
1212
extraConfig:
1313
timing: |
14-
c.Spawner.notebook_dir = '/home/jovyan/work/NetPyNE-UI'
14+
c.Spawner.notebook_dir = '/opt/workspace'
1515
c.Spawner.default_url = '/geppetto'
1616
spawner: >-
1717
c.Spawner.args = ["--library=netpyne_ui"]

‎k8s/minikube_values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ hub:
2020
c.Spawner.port = 8000
2121
c.Spawner.http_timeout = 300
2222
c.Spawner.start_timeout = 300
23-
c.Spawner.notebook_dir = '/home/jovyan/work/NetPyNE-UI'
23+
c.Spawner.notebook_dir = '/opt/workspace'
2424
c.Spawner.default_url = '/geppetto'
2525
c.Spawner.debug = True
2626
c.Spawner.disable_check_xsrf=True

‎tests/frontend/e2e/tests/ExperimentManager_Tut#1.test.js‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,13 +202,15 @@ describe('Experiment Manager test using Tut#1', () => {
202202

203203
it('Simulate All conditions', async () => {
204204

205-
await page.waitForSelector(selectors.SIMULATE_BUTTON_SELECTOR)
206-
await click(page, selectors.SIMULATE_BUTTON_SELECTOR, { timeout: TIMEOUT });
205+
await page.waitForSelector(selectors.MODEL_BUTTON_SELECTOR)
206+
await click(page, selectors.MODEL_BUTTON_SELECTOR, { timeout: TIMEOUT });
207+
await page.waitForSelector(selectors.SIMULATE_NETWORK_SELECTOR)
208+
await click(page, selectors.SIMULATE_NETWORK_SELECTOR, { timeout: TIMEOUT });
207209

208210
console.log('Simulating all conditions')
209-
210211
await page.waitForSelector(selectors.SIMULATE_POPUP_SELECTOR)
211212
await page.click(selectors.SIMULATE_POPUP_SELECTOR)
213+
await page.waitForSelector(selectors.CONFIRM_SIMULATE_SELECTOR)
212214
await page.click(selectors.CONFIRM_SIMULATE_SELECTOR)
213215

214216
await page.waitForTimeout(PAGE_WAIT);
@@ -217,8 +219,8 @@ describe('Experiment Manager test using Tut#1', () => {
217219
await page.click(selectors.CONFIRM_EXPERIMENT_STARTED_SELECTOR)
218220

219221
await page.waitForSelector(selectors.SIMULATION_PAGE_SELECTOR, { timeout: TIMEOUT * 2 });
220-
await page.waitForSelector(selectors.SIMULATION_LOADER_SELECTOR, { hidden: false, timeout: TIMEOUT * 2 })
221-
await page.waitForSelector(selectors.SIMULATION_LOADER_SELECTOR, { hidden: true, timeout: TIMEOUT * 5 })
222+
await page.waitForSelector(selectors.SIMULATION_LOADER_SELECTOR, { hidden: false, timeout: TIMEOUT * 5 })
223+
await page.waitForSelector(selectors.SIMULATION_LOADER_SELECTOR, { hidden: true, timeout: TIMEOUT * 10 })
222224
console.log('Experiment Simulation finished')
223225

224226
});

‎tests/frontend/e2e/tests/RxD.test.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ describe('RxD testing', () => {
9898
console.log('Loading Tutorial #3b ...')
9999

100100
await page.waitForTimeout(PAGE_WAIT)
101-
101+
await page.waitForSelector(selectors.TUTORIALS_BUTTON_SELECTOR, { timeout: TIMEOUT })
102102
await page.click(selectors.TUTORIALS_BUTTON_SELECTOR, { timeout: TIMEOUT })
103-
104-
await page.click("li[id='Model 3b: Multiscale network (high IP3)']", { timeout: TIMEOUT })
103+
await page.waitForSelector(selectors.TUTORIAL_3B_SELECTOR, { timeout: TIMEOUT })
104+
await page.click(selectors.TUTORIAL_3B_SELECTOR, { timeout: TIMEOUT })
105105
await page.waitForSelector('#E')
106106
await page.waitForSelector('#I')
107107
await page.waitForTimeout(PAGE_WAIT)
@@ -123,8 +123,9 @@ describe('RxD testing', () => {
123123
await page.waitForTimeout(PAGE_WAIT * 3)
124124

125125
await page.waitForSelector('div[title="3D Representation"][aria-disabled="false"]')
126-
126+
await page.waitForSelector(selectors.MODEL_BUTTON_SELECTOR, { timeout: TIMEOUT });
127127
await page.click(selectors.MODEL_BUTTON_SELECTOR, { timeout: TIMEOUT });
128+
await page.waitForSelector(selectors.SIMULATE_NETWORK_SELECTOR, { timeout: TIMEOUT });
128129
await page.click(selectors.SIMULATE_NETWORK_SELECTOR, { timeout: TIMEOUT });
129130
console.log('Simulating network ...')
130131

‎tests/frontend/e2e/tests/SaveOpenFile.test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ describe('Save / Open File testing', () => {
382382
return pwd_code_outputs.map(pwd_code_output => pwd_code_output.innerText)
383383
})
384384

385-
expect(first_code_output[0]).toBe("'/home/jovyan/work/NetPyNE-UI/workspace'")
385+
expect(first_code_output[0]).toBe("'/opt/workspace/workspace'")
386386

387387
const code_lines = await python_frame.$$(selectors.PYTHON_CELL_SELECTOR)
388388

@@ -398,7 +398,7 @@ describe('Save / Open File testing', () => {
398398
return cd_code_outputs.map(cd_code_output => cd_code_output.innerText)
399399
})
400400

401-
expect(second_code_output[0]).toBe("/home/jovyan/work/NetPyNE-UI/workspace/saved_models/aut_test/src\n")
401+
expect(second_code_output[0]).toBe("/opt/workspace/workspace/saved_models/aut_test/src\n")
402402

403403
const ls_code_lines = await python_frame.$$(selectors.PYTHON_CELL_SELECTOR)
404404

‎tests/frontend/e2e/tests/Tut#1_smoke.test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ describe('Tutorial #1 for Smoke Testing', () => {
9595
console.log('Tutorial #1')
9696

9797
await page.waitForTimeout(PAGE_WAIT)
98-
98+
await page.waitForSelector(selectors.TUTORIALS_BUTTON_SELECTOR, { timeout: TIMEOUT })
9999
await click(page, selectors.TUTORIALS_BUTTON_SELECTOR, { timeout: TIMEOUT })
100-
100+
await page.waitForSelector(selectors.TUTORIAL_1_SELECTOR, { timeout: TIMEOUT })
101101
await click(page, selectors.TUTORIAL_1_SELECTOR, { timeout: TIMEOUT })
102102
await page.waitForSelector(selectors.PYR_CELL_SELECTOR)
103103
await page.waitForTimeout(PAGE_WAIT)

‎tests/frontend/e2e/tests/Tut#2_smoke.test.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ describe('Tutorial #2 for Smoke Testing', () => {
9393
console.log('Tutorial #2')
9494

9595
await page.waitForTimeout(PAGE_WAIT)
96-
96+
await page.waitForSelector(selectors.TUTORIALS_BUTTON_SELECTOR, { visible: true })
9797
await page.click(selectors.TUTORIALS_BUTTON_SELECTOR, { timeout: TIMEOUT })
98-
98+
await page.waitForSelector(selectors.TUTORIAL_2_SELECTOR, { visible: true })
9999
await page.click(selectors.TUTORIAL_2_SELECTOR, { timeout: TIMEOUT })
100100
await page.waitForSelector(selectors.PYR_2_CELL_SELECTOR)
101101
await page.waitForSelector(selectors.INT_CELL_SELECTOR)
@@ -225,7 +225,7 @@ describe('Tutorial #2 for Smoke Testing', () => {
225225
});
226226

227227
it('Rate Spectogram Plot', async () => {
228-
228+
await page.waitForSelector(selectors.RATE_SPECTROGRAM_PLOT_SELECTOR, { visible: true })
229229
await page.click(selectors.RATE_SPECTROGRAM_PLOT_SELECTOR, { timeout: TIMEOUT })
230230
await page.waitForSelector(selectors.CANVAS_SELECTOR, { timeout: TIMEOUT })
231231

‎tests/frontend/e2e/tests/Tut#3a_smoke.test.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,10 @@ describe('Tutorial #3a for Smoke Testing', () => {
9494
console.log('Tutorial #3a')
9595

9696
await page.waitForTimeout(PAGE_WAIT)
97+
await page.waitForSelector(selectors.TUTORIALS_BUTTON_SELECTOR, { visible: true })
9798

9899
await page.click(selectors.TUTORIALS_BUTTON_SELECTOR, { timeout: TIMEOUT })
99-
100+
await page.waitForSelector(selectors.TUTORIAL_3A_SELECTOR, { visible: true })
100101
await page.click(selectors.TUTORIAL_3A_SELECTOR, { timeout: TIMEOUT })
101102
await page.waitForSelector(selectors.E_CELL_TYPE_SELECTOR)
102103
await page.waitForSelector(selectors.I_CELL_TYPE_SELECTOR)

0 commit comments

Comments
 (0)