Skip to content

Commit

Permalink
Merge pull request #121 from fedora-modularity/devel
Browse files Browse the repository at this point in the history
Fix shebangs and so
  • Loading branch information
phracek authored Oct 4, 2017
2 parents ec135f9 + 2a1f0b3 commit f1700fd
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 4 deletions.
5 changes: 4 additions & 1 deletion meta-test-family.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%global framework_name moduleframework

Name: meta-test-family
Version: 0.7.3
Version: 0.7.4
Release: 1%{?dist}
Summary: Tool to test components of a modular Fedora

Expand Down Expand Up @@ -54,6 +54,9 @@ install -d -p -m 755 %{buildroot}%{_datadir}/%{framework_name}


%changelog
* Wed Oct 04 2017 Petr Hracek <[email protected]> 0.7.4-1
- fix some packaging stuff

* Tue Sep 26 2017 Jan Scotka <[email protected]> 0.7.3-1
- remove old test and update template according to changes ([email protected])
- fix PDC trouble (Bad response code: 502) with Retry ([email protected])
Expand Down
Empty file modified moduleframework/bashhelper.py
100755 → 100644
Empty file.
Empty file modified moduleframework/module_framework.py
100755 → 100644
Empty file.
4 changes: 2 additions & 2 deletions moduleframework/mtf_environment.py
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Meta test family (MTF) is a tool to test components of a modular Fedora:
Expand Down Expand Up @@ -31,7 +30,6 @@
from moduleframework.environment_prepare.nspawn_prepare import EnvNspawn



module_name = get_module_type_base()
print_info("Setting environment for module: {} ".format(module_name))

Expand All @@ -42,11 +40,13 @@
elif module_name == "nspawn":
env = EnvNspawn()


def mtfenvset():
print_info("Preparing environment ...")
# cleanup_env exists in more forms for backend : EnvDocker/EnvRpm/EnvNspawn
env.prepare_env()


def mtfenvclean():
# cleanup_env exists in more forms for backend: EnvDocker/EnvRpm/EnvNspawn
env.cleanup_env()
Expand Down
2 changes: 1 addition & 1 deletion moduleframework/mtf_generator.py
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Meta test family (MTF) is a tool to test components of a modular Fedora:
Expand Down Expand Up @@ -37,6 +36,7 @@
from __future__ import print_function
from moduleframework.common import CommonFunctions


class TestGenerator(CommonFunctions):
def __init__(self):
"""
Expand Down
Empty file modified moduleframework/mtf_log_parser.py
100755 → 100644
Empty file.
Empty file modified moduleframework/timeoutlib.py
100755 → 100644
Empty file.

0 comments on commit f1700fd

Please sign in to comment.