Skip to content

Commit 2b97756

Browse files
committed
WIP Tests
1 parent 571ecb8 commit 2b97756

7 files changed

+18
-18
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ test-client: docker
1515
docker run --rm --entrypoint tox $(IMAGE) -c /opt/client/tox.ini
1616

1717
test-ingester: docker
18-
docker run --rm --entrypoint py.test $(IMAGE) ingester
18+
docker run --rm --entrypoint py.test -vv $(IMAGE) ingester
1919

2020
test-api: docker
21-
docker run --rm --entrypoint py.test $(IMAGE) api
21+
docker run --rm --entrypoint py.test -vv $(IMAGE) api
2222

2323
.PHONY: test # Run the tests
2424
test:

ingester/tests/data/multi-notification-copy-s3-file.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"expected_datalake_records": [
3232
{
3333
"url": "s3://foo/existing",
34-
"size": 0,
34+
"size": 36,
3535
"create_time": 236574060000,
3636
"version": 0,
3737
"time_index_key": "16552:syslog",
@@ -83,7 +83,7 @@
8383
"expected_datalake_records": [
8484
{
8585
"url": "s3://foo/new_name",
86-
"size": 0,
86+
"size": 36,
8787
"create_time": 236574060000,
8888
"version": 0,
8989
"time_index_key": "16552:syslog",

ingester/tests/data/s3-notification-multipart-event.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"expected_datalake_records": [{
3131
"version": 0,
3232
"url": "s3://datalake-test/2-california/syslog/1612876178000/9fd061c46d004031b2ceafbb729a0ea3-syslog-284.txt",
33-
"size": 0,
33+
"size": 36,
3434
"create_time": 236574060000,
3535
"time_index_key": "18667:syslog",
3636
"work_id_index_key": "null9fd061c46d004031b2ceafbb729a0ea3:syslog",
@@ -57,7 +57,7 @@
5757
"records": [
5858
{
5959
"url": "s3://datalake-test/2-california/syslog/1612876178000/9fd061c46d004031b2ceafbb729a0ea3-syslog-284.txt",
60-
"size": 0,
60+
"size": 36,
6161
"create_time": 236574060000,
6262
"metadata": {
6363
"version": 0,

ingester/tests/data/s3-notification-null-end-time.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"expected_datalake_records": [{
3030
"version": 0,
3131
"url": "s3://datalake-test/3-0a16/commands/1429084800000/34182375d96f460789e9ab4fcb6b4475-commands-655.txt",
32-
"size": 0,
32+
"size": 36,
3333
"create_time": 236574060000,
3434
"time_index_key": "16552:commands",
3535
"work_id_index_key": "null34182375d96f460789e9ab4fcb6b4475:commands",
@@ -55,7 +55,7 @@
5555
"records": [
5656
{
5757
"url": "s3://datalake-test/3-0a16/commands/1429084800000/34182375d96f460789e9ab4fcb6b4475-commands-655.txt",
58-
"size": 0,
58+
"size": 36,
5959
"create_time": 236574060000,
6060
"metadata": {
6161
"version": 0,

ingester/tests/data/s3-notification-one-record.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"expected_datalake_records": [{
3030
"version": 0,
3131
"url": "s3://datalake-test/2-california/syslog/1430092800000/2544375f44efb2ef5568d8a9ccf8ea9e0c9f122b-syslog-284.txt",
32-
"size": 0,
32+
"size": 36,
3333
"create_time": 236574060000,
3434
"time_index_key": "16552:syslog",
3535
"work_id_index_key": "null2544375f44efb2ef5568d8a9ccf8ea9e0c9f122b:syslog",
@@ -55,7 +55,7 @@
5555
"records": [
5656
{
5757
"url": "s3://datalake-test/2-california/syslog/1430092800000/2544375f44efb2ef5568d8a9ccf8ea9e0c9f122b-syslog-284.txt",
58-
"size": 0,
58+
"size": 36,
5959
"create_time": 236574060000,
6060
"metadata": {
6161
"version": 0,

ingester/tests/data/s3-notification-two-records.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"expected_datalake_records": [{
3030
"version": 0,
3131
"url": "s3://datalake-test/2-california/syslog/1430092800000/2544375f44efb2ef5568d8a9ccf8ea9e0c9f122b-syslog-284.txt",
32-
"size": 0,
32+
"size": 36,
3333
"create_time": 236574060000,
3434
"time_index_key": "16552:syslog",
3535
"work_id_index_key": "null2544375f44efb2ef5568d8a9ccf8ea9e0c9f122b:syslog",
@@ -49,7 +49,7 @@
4949
{
5050
"version": 0,
5151
"url": "s3://datalake-test/2-california/syslog/1430092800000/2544375f44efb2ef5568d8a9ccf8ea9e0c9f122b-syslog-284.txt",
52-
"size": 0,
52+
"size": 36,
5353
"create_time": 236574060000,
5454
"time_index_key": "16553:syslog",
5555
"work_id_index_key": "null2544375f44efb2ef5568d8a9ccf8ea9e0c9f122b:syslog",
@@ -69,7 +69,7 @@
6969
{
7070
"version": 0,
7171
"url": "s3://datalake-test/2-california/syslog/1430092800000/2544375f44efb2ef5568d8a9ccf8ea9e0c9f122b-syslog-284.txt",
72-
"size": 0,
72+
"size": 36,
7373
"create_time": 236574060000,
7474
"time_index_key": "16554:syslog",
7575
"work_id_index_key": "null2544375f44efb2ef5568d8a9ccf8ea9e0c9f122b:syslog",
@@ -95,7 +95,7 @@
9595
"records": [
9696
{
9797
"url": "s3://datalake-test/2-california/syslog/1430092800000/2544375f44efb2ef5568d8a9ccf8ea9e0c9f122b-syslog-284.txt",
98-
"size": 0,
98+
"size": 36,
9999
"create_time": 236574060000,
100100
"metadata": {
101101
"version": 0,

ingester/tests/data/s3-notification-two-s3-records.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
},
4343
"expected_datalake_records": [{
4444
"version": 0,
45-
"size": 0,
45+
"size": 36,
4646
"create_time": 236574060000,
4747
"url": "s3://datalake-test/2-california/syslog/1430092800000/2544375f44efb2ef5568d8a9ccf8ea9e0c9f122b-syslog-284.txt",
4848
"time_index_key": "16552:syslog",
@@ -62,7 +62,7 @@
6262
},
6363
{
6464
"version": 0,
65-
"size": 0,
65+
"size": 36,
6666
"create_time": 236574060000,
6767
"url": "s3://datalake-test/9-kentucky/nginx/1430092800000/f9213e49accd52432b3cfea94239c0eaa90f4431-nginx.gz",
6868
"time_index_key": "16552:nginx",
@@ -90,7 +90,7 @@
9090
{
9191
"url": "s3://datalake-test/2-california/syslog/1430092800000/2544375f44efb2ef5568d8a9ccf8ea9e0c9f122b-syslog-284.txt",
9292
"create_time": 236574060000,
93-
"size": 0,
93+
"size": 36,
9494
"metadata": {
9595
"version": 0,
9696
"work_id": null,
@@ -106,7 +106,7 @@
106106
{
107107
"url": "s3://datalake-test/9-kentucky/nginx/1430092800000/f9213e49accd52432b3cfea94239c0eaa90f4431-nginx.gz",
108108
"create_time": 236574060000,
109-
"size": 0,
109+
"size": 36,
110110
"metadata": {
111111
"version": 0,
112112
"work_id": null,

0 commit comments

Comments
 (0)