git://git.onelab.eu
/
tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
f24 & dnf --allowerasing
[tests.git]
/
system
/
TestPlc.py
diff --git
a/system/TestPlc.py
b/system/TestPlc.py
index
b106fe0
..
cd36c0c
100644
(file)
--- a/
system/TestPlc.py
+++ b/
system/TestPlc.py
@@
-185,6
+185,7
@@
class TestPlc:
# for inspecting the slice while it runs the first time
#'fail',
# check slices are turned off properly
# for inspecting the slice while it runs the first time
#'fail',
# check slices are turned off properly
+ 'debug_nodemanager',
'empty_slices', 'ssh_slice_off', 'slice_fs_deleted_ignore', SEP,
# check they are properly re-created with the same name
'fill_slices', 'ssh_slice_again', SEP,
'empty_slices', 'ssh_slice_off', 'slice_fs_deleted_ignore', SEP,
# check they are properly re-created with the same name
'fill_slices', 'ssh_slice_again', SEP,
@@
-206,7
+207,7
@@
class TestPlc:
'sfa_get_expires', SEPSFA,
'plc_db_dump' , 'plc_db_restore', SEP,
'check_netflow','check_drl', SEP,
'sfa_get_expires', SEPSFA,
'plc_db_dump' , 'plc_db_restore', SEP,
'check_netflow','check_drl', SEP,
- '
debug_nodemanager', '
slice_fs_present', SEP,
+ 'slice_fs_present', SEP,
'standby_1_through_20','yes','no',SEP,
'install_syslinux6', 'bonding_builds', 'bonding_nodes', SEP,
]
'standby_1_through_20','yes','no',SEP,
'install_syslinux6', 'bonding_builds', 'bonding_nodes', SEP,
]
@@
-342,7
+343,9
@@
class TestPlc:
def yum_install(self, rpms):
if isinstance(rpms, list):
rpms=" ".join(rpms)
def yum_install(self, rpms):
if isinstance(rpms, list):
rpms=" ".join(rpms)
- self.run_in_guest("yum -y install {}".format(rpms))
+ yum_mode = self.run_in_guest("yum -y install {}".format(rpms))
+ if yum_mode != 0:
+ self.run_in_guest("dnf -y install --allowerasing {}".format(rpms))
# yum-complete-transaction comes with yum-utils, that is in vtest.pkgs
self.run_in_guest("yum-complete-transaction -y")
return self.yum_check_installed(rpms)
# yum-complete-transaction comes with yum-utils, that is in vtest.pkgs
self.run_in_guest("yum-complete-transaction -y")
return self.yum_check_installed(rpms)
@@
-773,7
+776,7
@@
class TestPlc:
"run plc-config-tty"
tmpname = '{}.plc-config-tty'.format(self.name())
with open(tmpname,'w') as fileconf:
"run plc-config-tty"
tmpname = '{}.plc-config-tty'.format(self.name())
with open(tmpname,'w') as fileconf:
- for
(var,value)
in self.plc_spec['settings'].items():
+ for
var, value
in self.plc_spec['settings'].items():
fileconf.write('e {}\n{}\n'.format(var, value))
fileconf.write('w\n')
fileconf.write('q\n')
fileconf.write('e {}\n{}\n'.format(var, value))
fileconf.write('w\n')
fileconf.write('q\n')
@@
-1653,7
+1656,7
@@
class TestPlc:
"run sfa-config-tty"
tmpname = self.conffile("sfa-config-tty")
with open(tmpname,'w') as fileconf:
"run sfa-config-tty"
tmpname = self.conffile("sfa-config-tty")
with open(tmpname,'w') as fileconf:
- for
(var,value)
in self.plc_spec['sfa']['settings'].items():
+ for
var, value
in self.plc_spec['sfa']['settings'].items():
fileconf.write('e {}\n{}\n'.format(var, value))
fileconf.write('w\n')
fileconf.write('R\n')
fileconf.write('e {}\n{}\n'.format(var, value))
fileconf.write('w\n')
fileconf.write('R\n')