fix testcases

vatlab · Jul 4, 2018 · 8594567 · 8594567
1 parent d84dbd7
commit 8594567
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/test/test_compare.py b/test/test_compare.py
@@ -37,8 +37,8 @@ def setUp(self):
         elif self.storeMode=="hdf5" and os.path.isfile('TestCompare_hdf5.tar.gz'):
             self.runCmd('vtools admin --load_snapshot TestCompare_hdf5.tar.gz')
         else:
-            self.runCmd('vtools import vcf/CEU.vcf.gz --build hg18')
             self.runCmd('vtools import --format fmt/basic_hg18 txt/input.tsv --build hg18 --sample_name input.tsv')
+            self.runCmd('vtools import vcf/CEU.vcf.gz --build hg18')
             self.runCmd('vtools phenotype --from_file phenotype/phenotype.txt')
             self.runCmd('vtools use ann/testNSFP.ann')
             self.runCmd('vtools select variant \'testNSFP.chr is not null\' -t ns')

diff --git a/test/test_import.py b/test/test_import.py
@@ -81,7 +81,7 @@ def testDupGenotype1(self):
         self.assertProj(numOfVariants=288)
 
 
-    @unittest.skipUnless(os.getenv("STOREMODE")=="sqlite3","HDF5 version is not implemented for this test")
+    # @unittest.skipUnless(os.getenv("STOREMODE")=="sqlite3","HDF5 version is not implemented for this test")
     def testANNOVAR(self):
         'Testing the annovar input format'
         self.assertSucc('vtools import --build hg18 --format ../resources/format/ANNOVAR txt/ANNOVAR.txt')
@@ -97,6 +97,7 @@ def testANNOVAR(self):
         self.assertSucc('vtools select variant "function is not NULL" -t function')
         self.assertProj(numOfVariants={'function': 78})
 
+    @unittest.skipUnless(os.getenv("STOREMODE")=="sqlite3","HDF5 version is not implemented for this test")
     def testCASAVA18_SNP(self):
         'Testing the CASAVA SNP input format'
         self.assertSucc('vtools import --build hg18 --format ../resources/format/CASAVA18_snps txt/CASAVA18_SNP.txt')