Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
panacota
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Amandine PERRIN
panacota
Commits
2356ec72
Commit
2356ec72
authored
4 years ago
by
Amandine PERRIN
Browse files
Options
Downloads
Patches
Plain Diff
fixed changes with functional tests
parent
d425265d
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Pipeline
#38520
passed
4 years ago
Stage: test
Stage: coverage
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
test/test_functional/test_annote.py
+5
-3
5 additions, 3 deletions
test/test_functional/test_annote.py
with
5 additions
and
3 deletions
test/test_functional/test_annote.py
+
5
−
3
View file @
2356ec72
...
@@ -318,7 +318,8 @@ def test_main_onexistingprodigaldir(capsys):
...
@@ -318,7 +318,8 @@ def test_main_onexistingprodigaldir(capsys):
"
PanACoTA-annotate_list_genomes-func-test-exist_dir.log.details
"
)
"
PanACoTA-annotate_list_genomes-func-test-exist_dir.log.details
"
)
with
open
(
logfile
,
"
r
"
)
as
lc
:
with
open
(
logfile
,
"
r
"
)
as
lc
:
log_content
=
lc
.
readlines
()
log_content
=
lc
.
readlines
()
assert
(
"
Prodigal results folder already exists
"
)
in
"
"
.
join
(
log_content
)
assert
(
"
Prodigal results folder test/data/annotate/exp_files/H299_H561.fasta-prodigalRes
"
"
already exists
"
)
in
"
"
.
join
(
log_content
)
assert
(
"
Prodigal did not run again. Formatting step will use already generated results of
"
assert
(
"
Prodigal did not run again. Formatting step will use already generated results of
"
"
Prodigal in test/data/annotate/exp_files/H299_H561.fasta-prodigalRes.
"
"
Prodigal in test/data/annotate/exp_files/H299_H561.fasta-prodigalRes.
"
"
If you want to re-run Prodigal, first remove this result folder, or use
'
-F
'
or
"
"
If you want to re-run Prodigal, first remove this result folder, or use
'
-F
'
or
"
...
@@ -402,7 +403,7 @@ def test_main_existing_prodigaldir_errorannot(capsys):
...
@@ -402,7 +403,7 @@ def test_main_existing_prodigaldir_errorannot(capsys):
shutil
.
copyfile
(
ori_genome1
,
used_genome1
)
shutil
.
copyfile
(
ori_genome1
,
used_genome1
)
# Copy prokka results to genepath/genomes/gname-prokkaRes
# Copy prokka results to genepath/genomes/gname-prokkaRes
shutil
.
copytree
(
ori_prok_g1
,
used_prok_g1
)
shutil
.
copytree
(
ori_prok_g1
,
used_prok_g1
)
# Same thin
k
for 2nd genome
# Same thin
g
for 2nd genome
ori_genome2
=
os
.
path
.
join
(
GEN_PATH
,
"
H299_H561.fasta
"
)
ori_genome2
=
os
.
path
.
join
(
GEN_PATH
,
"
H299_H561.fasta
"
)
ori_prok_g2
=
os
.
path
.
join
(
EXP_DIR
,
"
H299_H561.fasta-prodigalRes
"
)
ori_prok_g2
=
os
.
path
.
join
(
EXP_DIR
,
"
H299_H561.fasta-prodigalRes
"
)
used_genome2
=
os
.
path
.
join
(
genome_path_used
,
"
H299_H561.fasta
"
)
used_genome2
=
os
.
path
.
join
(
genome_path_used
,
"
H299_H561.fasta
"
)
...
@@ -435,7 +436,8 @@ def test_main_existing_prodigaldir_errorannot(capsys):
...
@@ -435,7 +436,8 @@ def test_main_existing_prodigaldir_errorannot(capsys):
log_content
=
lc
.
readlines
()
log_content
=
lc
.
readlines
()
assert
(
"
Error: No genome was correctly annotated,
"
assert
(
"
Error: No genome was correctly annotated,
"
"
no need to format them
"
)
in
'
'
.
join
(
log_content
)
"
no need to format them
"
)
in
'
'
.
join
(
log_content
)
assert
(
"
Prodigal results folder already exists.
"
)
in
'
'
.
join
(
log_content
)
assert
(
"
Prodigal results folder test/data/annotate/generated_by_func-tests/genomes/
"
"
H299_H561.fasta-prodigalRes already exists.
"
)
in
'
'
.
join
(
log_content
)
assert
(
"
ESCO.1116.00002 B2_A3_5.fasta-changeName.fna:
"
assert
(
"
ESCO.1116.00002 B2_A3_5.fasta-changeName.fna:
"
"
no or several .faa file(s)
"
)
in
'
'
.
join
(
log_content
)
"
no or several .faa file(s)
"
)
in
'
'
.
join
(
log_content
)
assert
(
"
ESCO.1015.00001 H299_H561.fasta:
"
assert
(
"
ESCO.1015.00001 H299_H561.fasta:
"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment