merge 15.

test_data/design_diff_PE.txt

@@ -4,4 +4,4 @@ ENCLB568IYX	ENCSR729LGA	MCF-7	SP1	None	2	ENCLB336TVW	ENCFF330MCZ.fastq.gz	ENCFF2
 ENCLB678IDC	ENCSR217LRF	MCF-7	Control	None	1	ENCLB678IDC	ENCFF002DTU.fastq.gz	ENCFF002EFI.fastq.gz
 ENCLB336TVW	ENCSR217LRF	MCF-7	Control	None	2	ENCLB336TVW	ENCFF002EFG.fastq.gz	ENCFF002DTS.fastq.gz
 ENCLB552ACZ	ENCSR757EMK	MCF-7	SUZ12	None	1	ENCLB678IDC	ENCFF833EZX.fastq.gz	ENCFF161HBP.fastq.gz
-ENCLB568IYX	ENCSR757EMK	MCF-7	SUZ12	None	2	ENCLB336TVW	ENCFF776KZU.fastq.gz	ENCFF119KHM.fastq.gz
+ENCLB872TQR	ENCSR757EMK	MCF-7	SUZ12	None	2	ENCLB336TVW	ENCFF776KZU.fastq.gz	ENCFF119KHM.fastq.gz

workflow/tests/test_annotate_peaks.py

@@ -16,13 +16,13 @@ def test_annotate_peaks_singleend():
     assert os.path.exists(os.path.join(test_output_path, 'ENCSR238SGC.chipseeker_upsetplot.pdf'))
     annotation_file = test_output_path + 'ENCSR238SGC.chipseeker_annotation.csv'
     assert os.path.exists(annotation_file)
-    assert utils.count_lines(annotation_file) == 149820
+    assert utils.count_lines(annotation_file) == 152840
 
 
 @pytest.mark.pairedend
 def test_annotate_peaks_pairedend():
-    assert os.path.exists(os.path.join(test_output_path, 'ENCSR217LGA.chipseeker_pie.pdf'))
-    assert os.path.exists(os.path.join(test_output_path, 'ENCSR217LGA.chipseeker_upsetplot.pdf'))
-    annotation_file = test_output_path + 'ENCSR217LGA.chipseeker_annotation.csv'
+    assert os.path.exists(os.path.join(test_output_path, 'ENCSR729LGA..chipseeker_pie.pdf'))
+    assert os.path.exists(os.path.join(test_output_path, 'ENCSR729LGA..chipseeker_upsetplot.pdf'))
+    annotation_file = test_output_path + 'ENCSR729LGA..chipseeker_annotation.csv'
     assert os.path.exists(annotation_file)
     assert utils.count_lines(annotation_file) == 25391

workflow/tests/test_call_peaks_macs.py

@@ -23,4 +23,4 @@ def test_call_peaks_macs_pairedend():
     assert os.path.exists(os.path.join(test_output_path, 'ENCLB568IYX.pvalue_signal.bw'))
     assert os.path.exists(os.path.join(test_output_path, 'ENCLB568IYX.xls'))
     peak_file = test_output_path + 'ENCLB568IYX.narrowPeak'
-    assert utils.count_lines(peak_file) == 138827
+    assert utils.count_lines(peak_file) == 112652

workflow/tests/test_overlap_peaks.py

@@ -37,7 +37,7 @@ def test_check_update_design(design_diff):
 def test_overlap_peaks_singleend():
     assert os.path.exists(os.path.join(test_output_path, 'ENCSR238SGC.rejected.narrowPeak'))
     peak_file = test_output_path + 'ENCSR238SGC.replicated.narrowPeak'
-    assert utils.count_lines(peak_file) == 149828
+    assert utils.count_lines(peak_file) == 152848
 
 
 @pytest.mark.pairedend