Commit 4faa99ca authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Fixes relates to py.test

parent b4df040e
......@@ -241,7 +241,7 @@ def asn2dataModel(*files):
cat.start(cat_bin, args)
merged = waitfor_qprocess(cat, 'Merge dataviews')
with open(concat_path + '.asn', 'wt') as merged_file:
merged_file.write(merged)
merged_file.write(merged.data().decode('utf-8'))
# 3) Run asn2dataModel
asn2dm_bin = spawn.find_executable('asn2dataModel')
......@@ -265,16 +265,16 @@ def asn2dataModel(*files):
if concat_prefix in ASN2DM.keys():
# Re-import module if it was already loaded
asn1mod = ASN2DM[concat_prefix]
reload(asn1mod)
reload(asn1mod.DV)
importlib.reload(asn1mod)
importlib.reload(asn1mod.DV)
import Stubs
reload(Stubs)
importlib.reload(Stubs)
else:
asn1mod = importlib.import_module(concat_prefix + '_asn')
# force reload of modules in case of multiple calls
reload(asn1mod.DV)
importlib.reload(asn1mod.DV)
import Stubs
reload(Stubs)
importlib.reload(Stubs)
ASN2DM[concat_prefix] = asn1mod
sys.path.pop(0)
return asn1mod
......
#!/usr/bin/env python
import pytest
from PySide import QtCore
from opengeode.opengeode import SDL_Scene, SDL_View, G_SYMBOLS
from opengeode.sdlSymbols import Label, Decision
from opengeode.ogParser import parseSingleElement
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment