Commit 9dc83906 authored by Ivan Tyagov's avatar Ivan Tyagov

Revert "Clean up." This breaks tests (timeout needed).

This reverts commit ab6250a1.
parent ab6250a1
...@@ -3,6 +3,7 @@ import string ...@@ -3,6 +3,7 @@ import string
import random import random
import csv import csv
import os import os
import time
import numpy as np import numpy as np
import base64 import base64
...@@ -30,6 +31,7 @@ class TestDataIngestion(SecurityTestCase): ...@@ -30,6 +31,7 @@ class TestDataIngestion(SecurityTestCase):
self.assertEqual(self.INVALID, self.portal.getIngestionReferenceDictionary()["invalid_suffix"]) self.assertEqual(self.INVALID, self.portal.getIngestionReferenceDictionary()["invalid_suffix"])
self.assertEqual(self.EOF, self.REFERENCE_SEPARATOR + self.portal.getIngestionReferenceDictionary()["split_end_suffix"]) self.assertEqual(self.EOF, self.REFERENCE_SEPARATOR + self.portal.getIngestionReferenceDictionary()["split_end_suffix"])
self.assertEqual(self.PART_1, self.REFERENCE_SEPARATOR + self.portal.getIngestionReferenceDictionary()["split_first_suffix"]) self.assertEqual(self.PART_1, self.REFERENCE_SEPARATOR + self.portal.getIngestionReferenceDictionary()["split_first_suffix"])
# XXX: create default users
def getRandomReference(self): def getRandomReference(self):
random_string = ''.join([random.choice(string.ascii_letters + string.digits) for _ in xrange(10)]) random_string = ''.join([random.choice(string.ascii_letters + string.digits) for _ in xrange(10)])
...@@ -74,6 +76,7 @@ class TestDataIngestion(SecurityTestCase): ...@@ -74,6 +76,7 @@ class TestDataIngestion(SecurityTestCase):
request.set('data_chunk', encoded_data_chunk) request.set('data_chunk', encoded_data_chunk)
ingestion_policy.ingest() ingestion_policy.ingest()
self.tic() self.tic()
return
def ingest(self, data_chunk, reference, extension, eof): def ingest(self, data_chunk, reference, extension, eof):
ingestion_reference = self.getIngestionReference(reference, extension) ingestion_reference = self.getIngestionReference(reference, extension)
...@@ -82,7 +85,7 @@ class TestDataIngestion(SecurityTestCase): ...@@ -82,7 +85,7 @@ class TestDataIngestion(SecurityTestCase):
ingestion_policy = self.portal.portal_ingestion_policies.wendelin_embulk ingestion_policy = self.portal.portal_ingestion_policies.wendelin_embulk
self.ingestRequest(ingestion_reference, eof, data_chunk, ingestion_policy) self.ingestRequest(ingestion_reference, eof, data_chunk, ingestion_policy)
_, ingestion_reference = self.sanitizeReference(ingestion_reference) ingestion_id, ingestion_reference = self.sanitizeReference(ingestion_reference)
return ingestion_reference return ingestion_reference
...@@ -148,15 +151,19 @@ class TestDataIngestion(SecurityTestCase): ...@@ -148,15 +151,19 @@ class TestDataIngestion(SecurityTestCase):
reference = self.getRandomReference() reference = self.getRandomReference()
ingestion_reference = self.ingest(data_chunk_1, reference, self.FIF, self.PART_1) ingestion_reference = self.ingest(data_chunk_1, reference, self.FIF, self.PART_1)
time.sleep(1)
self.tic() self.tic()
ingestion_reference = self.ingest(data_chunk_2, reference, self.FIF, self.PART_2) ingestion_reference = self.ingest(data_chunk_2, reference, self.FIF, self.PART_2)
time.sleep(1)
self.tic() self.tic()
ingestion_reference = self.ingest(data_chunk_3, reference, self.FIF, self.PART_3) ingestion_reference = self.ingest(data_chunk_3, reference, self.FIF, self.PART_3)
time.sleep(1)
self.tic() self.tic()
ingestion_reference = self.ingest(data_chunk_4, reference, self.FIF, self.EOF) ingestion_reference = self.ingest(data_chunk_4, reference, self.FIF, self.EOF)
time.sleep(1)
self.tic() self.tic()
# call explicitly alarm so all 4 Data Streams can be concatenated to one # call explicitly alarm so all 4 Data Streams can be concatenated to one
......
...@@ -46,8 +46,9 @@ ...@@ -46,8 +46,9 @@
<key> <string>text_content_warning_message</string> </key> <key> <string>text_content_warning_message</string> </key>
<value> <value>
<tuple> <tuple>
<string>W: 92, 34: Unused variable \'i\' (unused-variable)</string> <string>W: 88, 4: Unused variable \'ingestion_id\' (unused-variable)</string>
<string>W: 92, 76: Unused variable \'j\' (unused-variable)</string> <string>W: 95, 34: Unused variable \'i\' (unused-variable)</string>
<string>W: 95, 76: Unused variable \'j\' (unused-variable)</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment