Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed qtp_visualization/tests/test_data/bad_vis.qvz
Binary file not shown.
1 change: 1 addition & 0 deletions qtp_visualization/tests/test_data/bad_vis.qzv
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This is truly no qiime2 visualization!
16 changes: 10 additions & 6 deletions qtp_visualization/tests/test_validate.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ def setUp(self):
self.out_dir = mkdtemp()
self._clean_up_files = [self.out_dir]

path_builder = partial(join, dirname(__file__), 'test_data')
path_builder = partial(join, self.base_data_dir,
dirname(__file__), 'test_data')
self.valid_qzv = path_builder('good_vis.qzv')
self.invalid_qzv = path_builder('bad_vis.qzv')

Expand All @@ -43,19 +44,21 @@ def tearDown(self):

def test_validate_q2_visualization(self):
# Valid qzv
valid_qzv = self.qclient.push_file_to_central(self.valid_qzv)
obs_succes, obs_ainfo, obs_error = _validate_q2_visualization(
{'qzv': [self.valid_qzv]}, self.out_dir)
{'qzv': [valid_qzv]}, self.out_dir)
self.assertEqual(obs_error, "")
self.assertTrue(obs_succes)
exp_files = [(self.valid_qzv, 'qzv'),
exp_files = [(valid_qzv, 'qzv'),
(join(self.out_dir, 'index.html'), 'html_summary'),
(join(self.out_dir, 'support_files'), 'html_summary_dir')]
exp_ainfo = [ArtifactInfo(None, 'q2_visualization', exp_files)]
self.assertEqual(obs_ainfo, exp_ainfo)

# Invalid qzv
invalid_qzv = self.qclient.push_file_to_central(self.invalid_qzv)
obs_succes, obs_ainfo, obs_error = _validate_q2_visualization(
{'qzv': [self.invalid_qzv]}, self.out_dir)
{'qzv': [invalid_qzv]}, self.out_dir)
self.assertIn("Error loading Qiime 2 visualization:", obs_error)
self.assertFalse(obs_succes)
self.assertIsNone(obs_ainfo)
Expand Down Expand Up @@ -83,13 +86,14 @@ def test_validate(self):
self.assertIsNone(obs_ainfo)

# q2_visualization success
valid_qzv = self.qclient.push_file_to_central(self.valid_qzv)
job_id, params = self._create_job('q2_visualization',
{'qzv': [self.valid_qzv]})
{'qzv': [valid_qzv]})
obs_succes, obs_ainfo, obs_error = validate(
self.qclient, job_id, params, self.out_dir)
self.assertEqual(obs_error, "")
self.assertTrue(obs_succes)
exp_files = [(self.valid_qzv, 'qzv'),
exp_files = [(valid_qzv, 'qzv'),
(join(self.out_dir, 'index.html'), 'html_summary'),
(join(self.out_dir, 'support_files'), 'html_summary_dir')]
exp_ainfo = [ArtifactInfo(None, 'q2_visualization', exp_files)]
Expand Down
6 changes: 4 additions & 2 deletions scripts/configure_visualization_types
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@ from qtp_visualization import plugin
@click.option('--env-script', prompt='Environment script',
default='source activate qtp-visualization')
@click.option('--server-cert', prompt='Server certificate', default='None')
def config(env_script, server_cert):
@click.argument('plugincoupling', required=False, default='filesystem')
def config(env_script, server_cert, plugincoupling):
"""Generates the Qiita configuration files"""
if server_cert == 'None':
server_cert = None
plugin.generate_config(env_script, 'start_visualization_types',
server_cert=server_cert)
server_cert=server_cert,
plugin_coupling=plugincoupling)

if __name__ == '__main__':
config()
Loading