Skip to content

Commit

Permalink
ex-266 (cgates/dkriti): Adjusted test to pass in python3
Browse files Browse the repository at this point in the history
  • Loading branch information
dkriti committed May 29, 2015
1 parent ec745fe commit bdf79c8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
5 changes: 1 addition & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#cgates/jebene: 7/9/2014
#cgates/jebene: 3/30/2015

language: python
python:
- "2.7"
Expand All @@ -22,4 +19,4 @@ after_success:
notifications:
email:
- cgates@umich.edu
- jebene@umich.edu
- dkriti@umich.edu
7 changes: 4 additions & 3 deletions test/merge_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -949,9 +949,10 @@ def test_get_format_tag_distribution_orderRetained(self):
"JQ_GT": ['##FORMAT=<ID=JQ_GT,Number=1,Type=Integer,Description="Genotype>']}.items()))

self.assertEquals(expected_format_tag_distribution, format_tag_distribution)
self.assertEquals("JQ_AF", format_tag_distribution.keys()[0])
self.assertEquals("JQ_DP", format_tag_distribution.keys()[1])
self.assertEquals("JQ_GT", format_tag_distribution.keys()[2])
tags = list(format_tag_distribution.keys())
self.assertEquals("JQ_AF", tags[0])
self.assertEquals("JQ_DP", tags[1])
self.assertEquals("JQ_GT", tags[2])

def test_get_format_tag_distribution_onlyKeepsTagsMatchingRegex(self):
file_contents1 = ["##metaheader1\n",
Expand Down

0 comments on commit bdf79c8

Please sign in to comment.