Skip to content

Fix analysis tests #1106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Apr 28, 2015
Merged

Fix analysis tests #1106

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
18efa9c
Adding the missing prep template to the DB
josenavas Apr 23, 2015
e845794
Fixing type on populate_test_db.sql
josenavas Apr 23, 2015
c6147b0
Merge branch 'fix-qiita-db-tests' into fix-analysis-tests
josenavas Apr 24, 2015
0ddb98a
Atatching the new prep template file to the prep template
josenavas Apr 24, 2015
5d7a752
fixing test_setup.py
josenavas Apr 24, 2015
e9fab3e
Fixing test_reference.py by removing magic numbers
josenavas Apr 24, 2015
ff305f9
Fixing test_job.py by removing magic numbers
josenavas Apr 24, 2015
01ec8bc
Fixing test_prep_template.py by removing magic numbers
josenavas Apr 24, 2015
69cfcc1
Fixing test_meta_util.py
josenavas Apr 24, 2015
c5f3107
Adding the qiime mapping file
josenavas Apr 24, 2015
4ef8b42
Fixing all the analysis tests. Fixes partially #247. Fixes #465
josenavas Apr 24, 2015
847485b
Fixing tests due to the addition of the mapping file
josenavas Apr 25, 2015
b43c3cc
Flake8
josenavas Apr 25, 2015
e7cefb0
Merge branch 'fix-qiita-db-tests' into fix-analysis-tests
josenavas Apr 25, 2015
e76a10c
Merge branch 'relax-md-req' of https://github.com/biocore/qiita into …
josenavas Apr 28, 2015
d1bee5e
Addressing @ElDeveloper comments
josenavas Apr 28, 2015
8be914f
Removing inference - good catch @ElDeveloper\!
josenavas Apr 28, 2015
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
Prev Previous commit
Next Next commit
Fixing test_meta_util.py
  • Loading branch information
@josenavas
josenavas committed Apr 24, 2015
commit 69cfcc107d23e1e1dadc5d4534137c2ec66ac153
6 changes: 3 additions & 3 deletions qiita_db/test/test_meta_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def test_get_accessible_filepath_ids(self):

obs = get_accessible_filepath_ids(User('shared@foo.bar'))
self.assertEqual(obs, set([1, 2, 5, 6, 7, 11, 12, 13, 14, 15, 16, 17,
18]))
18, 19]))

# Now shared should not have access to the study files
self._unshare_studies()
Expand All @@ -52,10 +52,10 @@ def test_get_accessible_filepath_ids(self):
# Now shared has access to public study files
self._set_processed_data_public()
obs = get_accessible_filepath_ids(User('shared@foo.bar'))
self.assertEqual(obs, set([1, 2, 5, 6, 7, 11, 16]))
self.assertEqual(obs, set([1, 2, 5, 6, 7, 11, 16, 19]))

# Test that it doesn't break: if the SampleTemplate hasn't been added
exp = set([1, 2, 5, 6, 7, 11, 12, 13, 14, 15, 16, 17, 18])
exp = set([1, 2, 5, 6, 7, 11, 12, 13, 14, 15, 16, 17, 18, 19])
obs = get_accessible_filepath_ids(User('test@foo.bar'))
self.assertEqual(obs, exp)

Expand Down