Skip to content

Commit 26d559c

Browse files
committed
also rm status
1 parent dd59619 commit 26d559c

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

qiita_db/test/test_util.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,7 @@ def test_generate_study_list(self):
866866
USER('shared@foo.bar'), 'test_study_1', info=info)
867867

868868
snew_info = {
869-
'status': 'sandbox', 'study_title': 'test_study_1',
869+
'study_title': 'test_study_1',
870870
'metadata_complete': True, 'publication_pid': [],
871871
'artifact_biom_ids': [], 'autoloaded': False,
872872
'study_id': new_study.id, 'ebi_study_accession': None,
@@ -942,8 +942,6 @@ def _avoid_duplicated_tests(all_artifacts=False):
942942

943943
# make artifacts of prep 2 public
944944
PREP(2).artifact.visibility = 'public'
945-
exp1[0]['status'] = 'public'
946-
exp_both[0]['status'] = 'public'
947945
_avoid_duplicated_tests()
948946

949947
# make artifacts of prep 1 awaiting_approval
@@ -976,7 +974,7 @@ def test_generate_study_list_without_artifacts(self):
976974
qdb.user.User('shared@foo.bar'), 'test_study_1', info=info)
977975

978976
exp_info = [
979-
{'status': 'private', 'study_title': (
977+
{'study_title': (
980978
'Identification of the Microbiomes for Cannabis Soils'),
981979
'metadata_complete': True, 'publication_pid': [
982980
'123456', '7891011'],
@@ -995,7 +993,7 @@ def test_generate_study_list_without_artifacts(self):
995993
'lifecycle.'), 'pi': ('PI_dude@foo.bar', 'PIDude'),
996994
'publication_doi': ['10.100/123456', '10.100/7891011'],
997995
'study_alias': 'Cannabis Soils', 'number_samples_collected': 27},
998-
{'status': 'sandbox', 'study_title': 'test_study_1',
996+
{'study_title': 'test_study_1',
999997
'metadata_complete': True, 'publication_pid': [],
1000998
'autoloaded': False,
1001999
'study_id': new_study.id, 'ebi_study_accession': None,
@@ -1283,7 +1281,6 @@ def test_purge_filepaths_test(self):
12831281
'study_id': 1,
12841282
'owner': 'Dude',
12851283
'study_alias': 'Cannabis Soils',
1286-
'status': 'private',
12871284
'study_abstract':
12881285
'This is a preliminary study to examine the microbiota '
12891286
'associated with the Cannabis plant. Soils samples '

qiita_db/util.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1558,7 +1558,6 @@ def generate_study_list(user, visibility):
15581558
del info["shared_with_name"]
15591559
del info["shared_with_email"]
15601560

1561-
info['status'] = qdb.study.Study(info['study_id']).status
15621561
infolist.append(info)
15631562
return infolist
15641563

@@ -1640,7 +1639,6 @@ def generate_study_list_without_artifacts(study_ids, portal=None):
16401639
del info["pi_email"]
16411640
del info["pi_name"]
16421641

1643-
info['status'] = qdb.study.Study(info['study_id']).status
16441642
infolist.append(info)
16451643
return infolist
16461644

0 commit comments

Comments
 (0)