Skip to content

Commit 7cf4559

Browse files
josenavasantgonza
authored andcommitted
Analysis refactor gui part6 (#2116)
* fix #1505 * improving some GUI stuff * improving some GUI stuff - missing lines * addressing all comments * ready for review * fix #1987 * initial commit * requested changes * fix filter job list * Fixing server cert (#2051) * fix get_studies * flake8 * fix #503 * fix #2010 * fix #1913 * fix errors * addressing @josenavas comment * flake8 * fix #1010 * fix #1066 (#2058) * addressing @josenavas comments * fix #1961 * fix #1837 * Automatic jobs & new stats (#2057) * fix #814, fix #1636 * fixing error in test-env * fixing stats.html call * adding img * addressing @josenavas comments * rm for loops * addresssing @ElDeveloper comments * generalizing this functionality * fix #1816 * fix #1959 * addressing @josenavas comments * addressing @josenavas comments * fixing error * fixed? * addressing @josenavas comments * addressing @wasade comments * fix flake8 * generate biom and metadata release (#2066) * initial commit * adding portal * addressing @josenavas comments * pid -> qiita_artifact_id * addressing @josenavas comments * addressing @ElDeveloper comments * rm 50.sql * database changes to fix 969 * adding delete * addressing @josenavas comments * addressing @ElDeveloper comments * duh! * fix generate_biom_and_metadata_release (#2072) * fix generate_biom_and_metadata_release * addressing @ElDeveloper comment * Removing qiita ware code that will not be used anymore * Organizing the handlers and new analysis description page * fixing timestamp * rm formats * st -> pt * Connecting the analysis creation and making interface responsive * Addressing @antgonza's comments * Initial artifact GUI refactor * Removing unused code * moving to ISO 8601 - wow :'( * fix errors * addressing @wasade comments * Adding can_edit call to the analysis * Fixing artifact rest API since not all artifacts have study * Adding can_be_publicized call to analysis * Adding QiitaHTTPError to handle errors gracefully * Adding safe_execution contextmanager * Fixing typo * Adding qiita test checker * Adapting some artifact handlers * Abstracting the graph reloading and adding some documentation * Fixing typo * Fixing changing artifact visibility * Fixing delete * Fixing artifact deletion * Adding default parameters to the commands * Fixing processing page * Fixing variable name * fixing private/public studies * Changing bdiv metrics to single choice * sanbox-to-sandbox * flake8 * Fixing patch * fixing other issues * adding share documentation * psycopg2 <= 2.7 * psycopg2 < 2.7 * Various small fixes to be able to run tests on the plugins * Solving merge conflicts
1 parent f21d896 commit 7cf4559

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1426
-1148
lines changed

qiita_core/tests/test_configuration_manager.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ def test_get_portal(self):
201201
obs._get_portal(self.conf)
202202
self.assertEqual(obs.portal_dir, "/gold_portal")
203203

204+
204205
CONF = """
205206
# ------------------------------ Main settings --------------------------------
206207
[main]

qiita_core/tests/test_util.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,6 @@ def test_get_qiita_version(self):
6464
# testing just the version
6565
self.assertEqual(exp_version, qdb.__version__)
6666

67+
6768
if __name__ == '__main__':
6869
main()

qiita_db/exceptions.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,5 @@ class QiitaDBWarning(UserWarning):
111111
"""Warning specific for the QiitaDB domain"""
112112
pass
113113

114+
114115
warnings.simplefilter('always', QiitaDBWarning)

qiita_db/handlers/tests/test_artifact.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,5 +239,6 @@ def test_post(self):
239239
data=data)
240240
self.assertEqual(obs.code, 200)
241241

242+
242243
if __name__ == '__main__':
243244
main()

qiita_db/handlers/tests/test_core.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@ def test_post(self):
2020
self.assertEqual(obs.code, 200)
2121
self.assertFalse(qdb.user.User.exists('new_user@test.foo'))
2222

23+
2324
if __name__ == '__main__':
2425
main()

qiita_db/handlers/tests/test_oauth2.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,5 +294,6 @@ def test_authenticate_password_missing_info(self):
294294
'error_description': 'Oauth2 error: missing user information'}
295295
self.assertEqual(obs_body, exp)
296296

297+
297298
if __name__ == "__main__":
298299
main()

qiita_db/handlers/tests/test_plugin.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,5 +197,6 @@ def test_post(self):
197197
data={})
198198
self.assertEqual(obs.code, 200)
199199

200+
200201
if __name__ == '__main__':
201202
main()

qiita_db/handlers/tests/test_prep_template.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,18 @@ def test_get(self):
4646
path_builder = partial(join, db_test_template_dir)
4747

4848
obs = loads(obs.body)
49-
exp = {'data_type': '18S',
50-
'artifact': 1,
51-
'investigation_type': 'Metagenomics',
52-
'study': 1,
53-
'status': 'private',
54-
'qiime-map': path_builder('1_prep_1_qiime_19700101-000000.txt'),
55-
'prep-file': path_builder('1_prep_1_19700101-000000.txt')}
56-
self.assertEqual(obs, exp)
49+
50+
# have to check per key because since patch 51 we are updating the
51+
# test info files
52+
self.assertEqual(obs['data_type'], '18S')
53+
self.assertEqual(obs['artifact'], 1)
54+
self.assertEqual(obs['investigation_type'], 'Metagenomics')
55+
self.assertEqual(obs['study'], 1)
56+
self.assertEqual(obs['status'], 'private')
57+
self.assertTrue(obs['qiime-map'].startswith(
58+
path_builder('1_prep_1_qiime_')))
59+
self.assertTrue(obs['prep-file'].startswith(
60+
path_builder('1_prep_1_')))
5761

5862

5963
class PrepTemplateDataHandlerTests(OauthTestingBase):

qiita_db/handlers/tests/test_processing_job.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,5 +274,6 @@ def test_post_processing_job_status(self):
274274
self.assertEqual(qdb.processing_job.ProcessingJob(job_id).status,
275275
'running')
276276

277+
277278
if __name__ == '__main__':
278279
main()

qiita_db/handlers/tests/test_reference.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,6 @@ def test_get(self):
5151
exp = {'name': 'Greengenes', 'version': '13_8', 'files': fps}
5252
self.assertEqual(loads(obs.body), exp)
5353

54+
5455
if __name__ == '__main__':
5556
main()

0 commit comments

Comments
 (0)