use query to filter submission to test on

CybercentreCanada · May 20, 2020 · fa1cac3 · fa1cac3
1 parent b65ba50
commit fa1cac3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 16 deletions.
diff --git a/test/test_file.py b/test/test_file.py
@@ -14,7 +14,7 @@
 
 
 def test_children(datastore, client):
- submission_id = random_id_from_collection(datastore, 'submission')
+ submission_id = random_id_from_collection(datastore, 'submission', q="file_count:[2 TO *]")
  submission_data = datastore.submission.get(submission_id)
  file_id = submission_data.files[0].sha256
 

diff --git a/test/test_submission.py b/test/test_submission.py
@@ -40,7 +40,7 @@ def test_get_file_detail_for_submission(datastore, client):
 
 
 def test_get_full_submission(datastore, client):
- submission_id = random_id_from_collection(datastore, 'submission')
+ submission_id = random_id_from_collection(datastore, 'submission', q="file_count:[2 TO *]")
  submissison_data = datastore.submission.get(submission_id, as_obj=False)
 
  res = client.submission.full(submission_id)
@@ -69,7 +69,7 @@ def test_get_submission_summary(datastore, client):
 
 
 def test_get_submission_tree(datastore, client):
- submission_id = random_id_from_collection(datastore, 'submission')
+ submission_id = random_id_from_collection(datastore, 'submission', q="file_count:[2 TO *]")
  submission_data = datastore.submission.get(submission_id)
 
  res = client.submission.tree(submission_id)

diff --git a/test/test_submit.py b/test/test_submit.py
@@ -26,8 +26,6 @@ def test_submit_content(datastore, client):
  assert res['files'][0]['name'] == fname
  assert res == datastore.submission.get(res['sid'], as_obj=False)
 
- datastore.submission.delete(res['sid'])
-
 
 def test_submit_path(datastore, client):
  content = get_random_phrase(wmin=15, wmax=50).encode()
@@ -42,8 +40,6 @@ def test_submit_path(datastore, client):
  assert res['params']['service_spec'] == params['service_spec']
  assert res == datastore.submission.get(res['sid'], as_obj=False)
 
- datastore.submission.delete(res['sid'])
-
 
 def test_submit_sha(datastore, client):
  file_id = random_id_from_collection(datastore, 'file')
@@ -54,8 +50,6 @@ def test_submit_sha(datastore, client):
  assert res['metadata'] == metadata
  assert res == datastore.submission.get(res['sid'], as_obj=False)
 
- datastore.submission.delete(res['sid'])
-
 
 def test_submit_url(datastore, client):
  url='https://www.cyber.gc.ca/en/theme-gcwu-fegc/assets/wmms.svg'
@@ -67,8 +61,6 @@ def test_submit_url(datastore, client):
  assert res['params'][k] == params[k]
  assert res == datastore.submission.get(res['sid'], as_obj=False)
 
- datastore.submission.delete(res['sid'])
-
 
 def test_submit_dynamic(datastore, client):
  submission_id = random_id_from_collection(datastore, 'submission')
@@ -83,8 +75,6 @@ def test_submit_dynamic(datastore, client):
  if k not in ['submitter', 'services', 'description']:
  assert res['params'][k] == submission_data['params'][k]
 
- datastore.submission.delete(res['sid'])
-
 
 def test_resubmit(datastore, client):
  submission_id = random_id_from_collection(datastore, 'submission')
@@ -96,5 +86,3 @@ def test_resubmit(datastore, client):
  for k in res['params']:
  if k not in ['submitter', 'description']:
  assert res['params'][k] == submission_data['params'][k]
-
- datastore.submission.delete(res['sid'])
diff --git a/test/test_submit_cli.py b/test/test_submit_cli.py
@@ -29,7 +29,7 @@ def test_submit(datastore):
 
 
 def test_result_to_text(datastore, client):
- submission_id = random_id_from_collection(datastore, 'submission')
+ submission_id = random_id_from_collection(datastore, 'submission', q="file_count:[2 TO *]")
  data = client.submission.full(submission_id)
  text = "\n".join(al_result_to_text(data))
  assert len(text) != 0