Skip to content

Fix sample obj #1074

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 11 commits into from
Apr 27, 2015
Merged

Fix sample obj #1074

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cf85cfd
Merge branch 'fix-extend' into fix-metadata-creation
josenavas Apr 17, 2015
b677ba0
Fixing sample obj tests
josenavas Apr 17, 2015
86f6474
Merge branch 'relax-db' into fix-sample-obj
josenavas Apr 17, 2015
de3659e
Merge branch 'relax-db' into fix-sample-obj
josenavas Apr 17, 2015
6472cf3
Fixing ReadOnly tests for PrepSample
josenavas Apr 17, 2015
4e87d20
Fixing ReadWrite tests for PrepSample
josenavas Apr 17, 2015
4ea0312
Merge branch 'master' of https://github.com/biocore/qiita into fix-sa…
josenavas Apr 21, 2015
771c27d
Merge branch 'relax-db' into fix-sample-obj
josenavas Apr 22, 2015
8772f32
Merge branch 'relax-db' into fix-sample-obj
josenavas Apr 24, 2015
69395bf
Merge branch 'relax-db' into fix-sample-obj
josenavas Apr 25, 2015
0439de9
Merge branch 'relax-md-req' of https://github.com/biocore/qiita into …
josenavas Apr 27, 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 ReadOnly tests for PrepSample
  • Loading branch information
@josenavas
josenavas committed Apr 17, 2015
commit 6472cf3f7cb3e33c3498a433d8450a10dc8f6001
10 changes: 5 additions & 5 deletions qiita_db/metadata_template/test/test_prep_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ def test_add_setitem_queries_required(self):
'center_name', 'FOO', conn_handler, queue)

obs = conn_handler.queues[queue]
sql = """UPDATE qiita.common_prep_info
SET center_name=%s
WHERE sample_id=%s"""
sql = """UPDATE qiita.prep_1
SET center_name=%s
WHERE sample_id=%s"""
exp = [(sql, ('FOO', '1.SKB8.640193'))]
self.assertEqual(obs, exp)

Expand All @@ -87,8 +87,8 @@ def test_add_setitem_queries_dynamic(self):

obs = conn_handler.queues[queue]
sql = """UPDATE qiita.prep_1
SET barcodesequence=%s
WHERE sample_id=%s"""
SET barcodesequence=%s
WHERE sample_id=%s"""
exp = [(sql, ('AAAAAAAAAAAA', '1.SKB8.640193'))]
self.assertEqual(obs, exp)

Expand Down