Skip to content
Snippets Groups Projects
Commit 16df92a7 authored by Bjarke Madsen's avatar Bjarke Madsen
Browse files

update broken test data filepaths

parent 1c710ccc
No related branches found
No related tags found
1 merge request!16Parallel testing
...@@ -14,11 +14,9 @@ import inventory_provider ...@@ -14,11 +14,9 @@ import inventory_provider
from inventory_provider.tasks import worker from inventory_provider.tasks import worker
from inventory_provider import config from inventory_provider import config
TEST_DATA_DIRNAME = os.path.realpath(os.path.join( TEST_DATA_DIRNAME = os.path.join(
inventory_provider.__path__[0], os.path.dirname(__file__),
"..", "data")
"test",
"data"))
_bootstrap_semaphore = threading.Semaphore() _bootstrap_semaphore = threading.Semaphore()
...@@ -43,7 +41,7 @@ def data_config_filename(): ...@@ -43,7 +41,7 @@ def data_config_filename():
"api": "ims_api", "api": "ims_api",
"username": "ims_username", "username": "ims_username",
"password": "ims_password" "password": "ims_password"
}, },
"managed-routers": "bogus url", "managed-routers": "bogus url",
"unmanaged-interfaces": [ "unmanaged-interfaces": [
{ {
...@@ -224,10 +222,10 @@ NETIFACES_TEST_DATA_STRING = """{ ...@@ -224,10 +222,10 @@ NETIFACES_TEST_DATA_STRING = """{
def mocked_netifaces(mocker): def mocked_netifaces(mocker):
s = NETIFACES_TEST_DATA_STRING s = NETIFACES_TEST_DATA_STRING
for k, v in { for k, v in {
'AF_INET': netifaces.AF_INET, 'AF_INET': netifaces.AF_INET,
'AF_INET6': netifaces.AF_INET6, 'AF_INET6': netifaces.AF_INET6,
'AF_LINK': netifaces.AF_LINK 'AF_LINK': netifaces.AF_LINK
}.items(): }.items():
s = s.replace('{%s}' % k, str(v)) s = s.replace('{%s}' % k, str(v))
data = ast.literal_eval(s) data = ast.literal_eval(s)
mocker.patch('netifaces.interfaces', lambda: data.keys()) mocker.patch('netifaces.interfaces', lambda: data.keys())
......
...@@ -2,13 +2,10 @@ import os ...@@ -2,13 +2,10 @@ import os
import responses import responses
import inventory_provider
from inventory_provider import juniper from inventory_provider import juniper
TEST_DATA_FILENAME = os.path.realpath(os.path.join( TEST_DATA_FILENAME = os.path.realpath(os.path.join(
inventory_provider.__path__[0], os.path.dirname(__file__),
'..',
'test',
'data', 'data',
'netdash-alldevices.txt')) 'netdash-alldevices.txt'))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment