Skip to content

Update reverse proxy and string test #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guzman-raphael merged 5 commits into from
Jul 17, 2020
Merged

Update reverse proxy and string test #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c6f466c
Merge pull request #243 from datajoint/stage-external-storage
eywalker May 19, 2020
ac98437
Update compose files and test against current new mym.
guzman-raphael Jul 14, 2020
46fc844
Update string test based on crash report.
guzman-raphael Jul 14, 2020
cd3ee29
Update pass criteria for test.
guzman-raphael Jul 14, 2020
8490d44
Update mym branch pointer.
guzman-raphael Jul 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions LNX-docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,17 @@ services:
interval: 1s
fakeservices.datajoint.io:
<<: *net
image: raphaelguzman/nginx:v0.0.4
image: raphaelguzman/nginx:v0.0.8
environment:
- ADD_db_TYPE=DATABASE
- ADD_db_ENDPOINT=db:3306
- ADD_minio_TYPE=MINIO
- ADD_minio_ENDPOINT=minio:9000
- ADD_minio_PREFIX=/
- ADD_minio_PORT=80 # allow unencrypted connections
- ADD_minio_PREFIX=/datajoint
- ADD_browser_TYPE=MINIOADMIN
- ADD_browser_ENDPOINT=minio:9000
- ADD_browser_PORT=80 # allow unencrypted connections
depends_on:
db:
condition: service_healthy
Expand All @@ -53,10 +57,10 @@ services:
- DJ_TEST_HOST=fakeservices.datajoint.io
- DJ_TEST_USER=datajoint
- DJ_TEST_PASSWORD=datajoint
- S3_ENDPOINT=fakeservices.datajoint.io:9000
- S3_ENDPOINT=fakeservices.datajoint.io
- S3_ACCESS_KEY=datajoint
- S3_SECRET_KEY=datajoint
- S3_BUCKET=datajoint-test
- S3_BUCKET=datajoint.test
image: raphaelguzman/matlab:${MATLAB_VERSION}-MIN
depends_on:
fakeservices.datajoint.io:
Expand Down
14 changes: 9 additions & 5 deletions local-docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,21 @@ services:
interval: 1s
fakeservices.datajoint.io:
<<: *net
image: raphaelguzman/nginx:v0.0.4
image: raphaelguzman/nginx:v0.0.8
environment:
- ADD_db_TYPE=DATABASE
- ADD_db_ENDPOINT=db:3306
- ADD_minio_TYPE=MINIO
- ADD_minio_ENDPOINT=minio:9000
- ADD_minio_PREFIX=/
- ADD_minio_PORT=80 # allow unencrypted connections
- ADD_minio_PREFIX=/datajoint
- ADD_browser_TYPE=MINIOADMIN
- ADD_browser_ENDPOINT=minio:9000
- ADD_browser_PORT=80 # allow unencrypted connections
ports:
- "80:80"
- "443:443"
- "3306:3306"
- "9000:9000"
depends_on:
db:
condition: service_healthy
Expand All @@ -59,10 +63,10 @@ services:
- DJ_TEST_HOST=fakeservices.datajoint.io
- DJ_TEST_USER=datajoint
- DJ_TEST_PASSWORD=datajoint
- S3_ENDPOINT=fakeservices.datajoint.io:9000
- S3_ENDPOINT=fakeservices.datajoint.io
- S3_ACCESS_KEY=datajoint
- S3_SECRET_KEY=datajoint
- S3_BUCKET=datajoint-test
- S3_BUCKET=datajoint.test
- MATLAB_USER
- MATLAB_LICENSE
- JUPYTER_PASSWORD=datajoint
Expand Down
4 changes: 2 additions & 2 deletions tests/TestFetch.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ function TestFetch_testVariousDatatypes(testCase)

insert(University.All, struct( ...
'id', 2, ...
'string', 'test', ...
'string', 'lteachen', ...
'date', '2019-12-17 13:38', ...
'number', 3.213, ...
'blob', [1, 2; 3, 4] ...
Expand All @@ -165,7 +165,7 @@ function TestFetch_testVariousDatatypes(testCase)
res = q.fetch('*');

testCase.verifyEqual(res(1).id, 2);
testCase.verifyEqual(res(1).string, 'test');
testCase.verifyEqual(res(1).string, 'lteachen');
testCase.verifyEqual(res(1).date, '2019-12-17 13:38:00');
testCase.verifyEqual(res(1).number, 3.213);
testCase.verifyEqual(res(1).blob, [1, 2; 3, 4]);
Expand Down