diff options
| author | Alexander Kabui | 2021-09-27 16:09:46 +0300 |
|---|---|---|
| committer | Alexander Kabui | 2021-09-27 16:09:46 +0300 |
| commit | 62054d914efb4322fba311f968cb27b662aa6806 (patch) | |
| tree | f904231c44d87db36e9b794f57373daf6508a11c /tests/unit/computations/test_parsers.py | |
| parent | 6f25b8e2b1d1a34c054d325b1c37b303529b8827 (diff) | |
| parent | 0cbb6ecde0315b7d6f021cb17406f5e5197e8a05 (diff) | |
| download | genenetwork3-62054d914efb4322fba311f968cb27b662aa6806.tar.gz | |
fix merge conflicts
Diffstat (limited to 'tests/unit/computations/test_parsers.py')
| -rw-r--r-- | tests/unit/computations/test_parsers.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/unit/computations/test_parsers.py b/tests/unit/computations/test_parsers.py index 19c3067..b51b0bf 100644 --- a/tests/unit/computations/test_parsers.py +++ b/tests/unit/computations/test_parsers.py @@ -15,7 +15,7 @@ class TestParsers(unittest.TestCase): def test_parse_genofile_with_existing_file(self): """Test that a genotype file is parsed correctly""" - strains = ["bxd1", "bxd2"] + samples = ["bxd1", "bxd2"] genotypes = [ {"chr": "1", "locus": "rs31443144", "cm": "1.50", "mb": "3.010274", @@ -51,4 +51,4 @@ class TestParsers(unittest.TestCase): "../test_data/genotype.txt" )) self.assertEqual(parse_genofile( - test_genotype_file), (strains, genotypes)) + test_genotype_file), (samples, genotypes)) |