Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
LOFAR
Manage
Activity
Members
Labels
Plan
Issues
Wiki
Jira issues
Open Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RadioObservatory
LOFAR
Commits
2c97a832
Commit
2c97a832
authored
6 years ago
by
Mattia Mancini
Browse files
Options
Downloads
Patches
Plain Diff
Story
SW-300
: Fixing python3 compatibility
parent
aacc4e63
No related branches found
No related tags found
2 merge requests
!89
Monitoring maintenance Epic branch merge
,
!1
Resolve OSB-13 "Monitoringmaintenance "
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
LCU/Maintenance/MDB_tools/cli/mdb_loader.py
+6
-7
6 additions, 7 deletions
LCU/Maintenance/MDB_tools/cli/mdb_loader.py
LCU/Maintenance/MDB_tools/test/t_mdb_loader.py
+3
-2
3 additions, 2 deletions
LCU/Maintenance/MDB_tools/test/t_mdb_loader.py
with
9 additions
and
9 deletions
LCU/Maintenance/MDB_tools/cli/mdb_loader.py
+
6
−
7
View file @
2c97a832
#! /usr/bin/env python
import
logging
import
argparse
import
requests
import
logging
import
re
import
sys
import
json
from
glob
import
glob
import
os
import
re
from
os.path
import
isfile
import
requests
logger
=
logging
.
getLogger
(
'
probe_mdb
'
)
logger
=
logging
.
getLogger
(
'
mdb_loader
'
)
"""
This program is meant to load the station tests and RTSM present in a certain directory to the database
...
...
@@ -36,7 +35,7 @@ def obtain_file_list(path):
:return:
"""
logger
.
info
(
'
listing file in %s
'
,
path
)
file_list
=
filter
(
os
.
path
.
isfile
,
glob
(
path
))
file_list
=
list
(
filter
(
isfile
,
glob
(
path
))
)
logger
.
debug
(
'
found files: %s
'
,
file_list
)
return
file_list
...
...
This diff is collapsed.
Click to expand it.
LCU/Maintenance/MDB_tools/test/t_mdb_loader.py
+
3
−
2
View file @
2c97a832
import
unittest
from
mock
import
patch
,
MagicMock
,
Mock
from
lofar.maintenance.utils.cli.mdb_loader
import
*
logger
=
logging
.
getLogger
(
__name__
)
...
...
@@ -78,13 +80,12 @@ class TESTMDBLoader(unittest.TestCase):
with
self
.
assertRaises
(
ValueError
):
create_query_string
(
is_station_test
=
False
,
is_rtsm
=
False
)
@patch
(
'
os.path
.isfile
'
)
@patch
(
'
lofar.maintenance.utils.cli.mdb_loader
.isfile
'
)
@patch
(
'
lofar.maintenance.utils.cli.mdb_loader.glob
'
)
def
test_obtain_file_path_list
(
self
,
glob_mock
,
isfile_mock
):
path
=
'
test
'
glob_return_values
=
[
'
test
'
,
'
test1
'
,
'
test2
'
]
glob_mock
.
return_value
=
glob_return_values
obtain_file_list
(
path
)
glob_mock
.
assert_called_with
(
path
)
self
.
assertEqual
(
isfile_mock
.
call_count
,
3
)
...
...
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