Skip to content

Commit ced6ca8

Browse files
author
Satheesh Rajendran
authored
Merge pull request #210 from sathnaga/travisfix
Fixup: make Travis happy
2 parents 8225de2 + 4a04de5 commit ced6ca8

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@
322322
OpenPOWER Host OS repositories on GitHub:
323323
https://github.com/open-power-host-os
324324

325-
8. Pre/Post Script support
325+
8. Pre/Post Script support
326326

327327
User need to popluate their pre/post scripts as prescript and postscript directory
328328
* Create a directory named "prescript" inside config/ directory and populated with pre scripts

avocado-setup.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
BASE_PATH = os.path.dirname(os.path.abspath(__file__))
3333
CONFIG_PATH = "%s/config/wrapper/env.conf" % BASE_PATH
34-
prescript="%s/config/prescript" % BASE_PATH
35-
postscipt="%s/config/postscript" % BASE_PATH
34+
prescript = "%s/config/prescript" % BASE_PATH
35+
postscipt = "%s/config/postscript" % BASE_PATH
3636
NORUNTEST_PATH = "%s/config/wrapper/no_run_tests.conf" % BASE_PATH
3737
TEST_CONF_PATH = "%s/config/tests/" % BASE_PATH
3838
CONFIGFILE = configparser.SafeConfigParser()
@@ -48,8 +48,8 @@
4848
DATA_DIR = "%s/data" % BASE_PATH
4949
LOG_DIR = "%s/results" % BASE_PATH
5050
logger = logger_init(filepath=BASE_PATH).getlogger()
51-
prescript_dir=CONFIGFILE.get('script-dir', 'prescriptdir')
52-
postscipt_dir=CONFIGFILE.get('script-dir', 'postscriptdir')
51+
prescript_dir = CONFIGFILE.get('script-dir', 'prescriptdir')
52+
postscipt_dir = CONFIGFILE.get('script-dir', 'postscriptdir')
5353

5454

5555
class TestSuite():
@@ -271,7 +271,6 @@ def install_optional_plugin(plugin):
271271
pass
272272

273273

274-
275274
def create_config(logdir):
276275
"""
277276
Create the local avocado config file
@@ -350,6 +349,7 @@ def bootstrap(enable_kvm=False):
350349
os.makedirs(postscipt_dir)
351350
helper.copy_dir_file(postscipt, postscipt_dir)
352351

352+
353353
def run_test(testsuite, avocado_bin):
354354
"""
355355
To run given testsuite
@@ -392,7 +392,7 @@ def run_test(testsuite, avocado_bin):
392392
if result_link:
393393
result_json = result_link + "/results.json"
394394
result_link += "/job.log\n"
395-
with open(result_json, encoding = "utf-8") as fp:
395+
with open(result_json, encoding="utf-8") as fp:
396396
result_state = json.load(fp)
397397
for state in ['pass', 'cancel', 'errors', 'failures', 'skip', 'warn', 'interrupt']:
398398
if state in result_state.keys():
@@ -418,6 +418,7 @@ def env_clean():
418418
if os.path.isdir(postscipt_dir):
419419
helper.remove_file(postscipt, postscipt_dir)
420420

421+
421422
def edit_mux_file(test_config_name, mux_file_path, tmp_mux_path):
422423
"""
423424
Edit the mux file with input given in input config file.

lib/helper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,4 +178,4 @@ def remove_file(src, dest):
178178
d_file = os.path.join(dest, item)
179179
if os.path.exists(d_file):
180180
os.remove(d_file)
181-
logger.debug("%s file deleted" % d_file)
181+
logger.debug("%s file deleted" % d_file)

0 commit comments

Comments
 (0)