From d4d9aafe47132a76b17792bfe7a4202a20f2c0c2 Mon Sep 17 00:00:00 2001 From: Diane Trout Date: Thu, 9 Jun 2011 16:35:30 -0700 Subject: [PATCH] Move test srf files to testdata directory so I can use them in other tests --- .../woldlab_070829_USI-EAS44_0017_FC11055_1.srf | Bin .../woldlab_090512_HWI-EAS229_0114_428NNAAXX_5.srf | Bin test/test_srf2fastq.py | 10 ++++++---- 3 files changed, 6 insertions(+), 4 deletions(-) rename {test => htsworkflow/pipelines/test/testdata}/woldlab_070829_USI-EAS44_0017_FC11055_1.srf (100%) rename {test => htsworkflow/pipelines/test/testdata}/woldlab_090512_HWI-EAS229_0114_428NNAAXX_5.srf (100%) diff --git a/test/woldlab_070829_USI-EAS44_0017_FC11055_1.srf b/htsworkflow/pipelines/test/testdata/woldlab_070829_USI-EAS44_0017_FC11055_1.srf similarity index 100% rename from test/woldlab_070829_USI-EAS44_0017_FC11055_1.srf rename to htsworkflow/pipelines/test/testdata/woldlab_070829_USI-EAS44_0017_FC11055_1.srf diff --git a/test/woldlab_090512_HWI-EAS229_0114_428NNAAXX_5.srf b/htsworkflow/pipelines/test/testdata/woldlab_090512_HWI-EAS229_0114_428NNAAXX_5.srf similarity index 100% rename from test/woldlab_090512_HWI-EAS229_0114_428NNAAXX_5.srf rename to htsworkflow/pipelines/test/testdata/woldlab_090512_HWI-EAS229_0114_428NNAAXX_5.srf diff --git a/test/test_srf2fastq.py b/test/test_srf2fastq.py index eee4152..74e031c 100644 --- a/test/test_srf2fastq.py +++ b/test/test_srf2fastq.py @@ -6,6 +6,8 @@ import unittest _module_path, _module_name = os.path.split(__file__) sys.path.append(os.path.join(_module_path, '..', 'scripts')) +from htsworkflow.pipelines.test.simulate_runfolder import TESTDATA_DIR + from htsworkflow.pipelines import srf2fastq class testSrf2Fastq(unittest.TestCase): @@ -113,9 +115,9 @@ IIIIB+++ def test_is_srf(self): cnf4_srf = 'woldlab_070829_USI-EAS44_0017_FC11055_1.srf' - cnf4_path = os.path.join(_module_path, cnf4_srf) + cnf4_path = os.path.join(TESTDATA_DIR, cnf4_srf) cnf1_srf = 'woldlab_090512_HWI-EAS229_0114_428NNAAXX_5.srf' - cnf1_path = os.path.join(_module_path, cnf1_srf) + cnf1_path = os.path.join(TESTDATA_DIR, cnf1_srf) is_srf = srf2fastq.is_srf self.failUnlessEqual(is_srf(__file__), False) @@ -124,9 +126,9 @@ IIIIB+++ def test_is_cnf1(self): cnf4_srf = 'woldlab_070829_USI-EAS44_0017_FC11055_1.srf' - cnf4_path = os.path.join(_module_path, cnf4_srf) + cnf4_path = os.path.join(TESTDATA_DIR, cnf4_srf) cnf1_srf = 'woldlab_090512_HWI-EAS229_0114_428NNAAXX_5.srf' - cnf1_path = os.path.join(_module_path, cnf1_srf) + cnf1_path = os.path.join(TESTDATA_DIR, cnf1_srf) is_cnf1 = srf2fastq.is_cnf1 self.failUnlessRaises(ValueError, is_cnf1, __file__) -- 2.30.2