Skip to content
Snippets Groups Projects
Commit 2c97a832 authored by Mattia Mancini's avatar Mattia Mancini
Browse files

Story SW-300: Fixing python3 compatibility

parent aacc4e63
No related branches found
No related tags found
2 merge requests!89Monitoring maintenance Epic branch merge,!1Resolve OSB-13 "Monitoringmaintenance "
#! /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
......
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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment