Re: [libvirt] [test-API 01/17] Destroy src/dist and move env_inspect.py back

As env_inspect.py is rewrote, and has good portability now. --- src/{dist/redhat => }/env_inspect.py | 0 src/generator.py | 9 +-------- 2 files changed, 1 insertions(+), 8 deletions(-) delete mode 100644 src/dist/__init__.py delete mode 100644 src/dist/redhat/__init__.py rename src/{dist/redhat => }/env_inspect.py (100%) diff --git a/src/dist/__init__.py b/src/dist/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/src/dist/redhat/__init__.py b/src/dist/redhat/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/src/dist/redhat/env_inspect.py b/src/env_inspect.py similarity index 100% rename from src/dist/redhat/env_inspect.py rename to src/env_inspect.py diff --git a/src/generator.py b/src/generator.py index 4247fda..fc6cec3 100644 --- a/src/generator.py +++ b/src/generator.py @@ -26,17 +26,10 @@ import traceback from src import mapper from src import env_parser +from src import env_inspect from utils import log from utils import format -# Import of distribution-specific code. If this is needed somewhere -# else in the future, please don't copy-paste this, but create some -# sensible distribution-specific package -for dist in os.listdir('src/dist'): - if os.path.exists('/etc/%s-release' % dist): - exec('from src.dist.%s import env_inspect' % dist) - break - class FuncGen(object): """ To generate a callable testcase""" def __init__(self, cases_func_ref_dict,