From 2691400e1323e6ae8655bbb9104b6c7c1744aec8 Mon Sep 17 00:00:00 2001
From: Amandine PERRIN <amandine.perrin@pasteur.fr>
Date: Mon, 25 Jul 2022 18:44:40 +0200
Subject: [PATCH] Merge github master
---
test/test_unit/test_prepare/test_download.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/test/test_unit/test_prepare/test_download.py b/test/test_unit/test_prepare/test_download.py
index b13ae33f..82131b56 100755
--- a/test/test_unit/test_prepare/test_download.py
+++ b/test/test_unit/test_prepare/test_download.py
@@ -694,8 +694,14 @@ def test_download_refseq_vs_genbank(caplog):
"""
Give a taxid of a subspecies, download strains from refseq, and then from genbank.
Currently, no strains in refseq, and 2 in genbank.
+<<<<<<< HEAD
39831 = Klebsiella pneumoniae subsp. rhinoscleromatis
(60 = Vitreoscilla sp.)
+=======
+ urrently, no strains in refseq, and 8 in genbank.
+ #39831 = Klebsiella pneumoniae subsp. rhinoscleromatis
+ 60 = Vitreoscilla sp.
+>>>>>>> 0896f49 (change taxid to compare refseq vs genbank)
Later, there can be some in refseq, but always at least 2 more in genbank
"""
caplog.set_level(logging.INFO)
--
GitLab