convenience macros restart-node and wait-node

[tests.git] / system / TestBonding.py

diff --git a/system/TestBonding.py b/system/TestBonding.py
index 4066e44..d94e4e9 100644 (file)
--- a/system/TestBonding.py
+++ b/system/TestBonding.py
@@ -27,6 +27,7 @@ def onelab_bonding_spec (buildname):
     # essentially generic ..
     buildname      = buildname
     
+    # visit the other build's test directory to figure its characteristics
     with open ("../{}/arg-fcdistro".format(buildname)) as input:
         fcdistro   = input.read().strip()
     with open ("../{}/arg-pldistro".format(buildname)) as input:
@@ -62,18 +63,18 @@ class TestBonding(object):
     options is a TestMain options
     """
     
-    def __init__(self, test_plc, bonding_spec, options):
+    def __init__(self, test_plc, bonding_spec, substrate, options):
         """
         test_plc is one local TestPlc instance
         bonding_spec is a dictionary that gives details on
         the build we want to be bonding with
         """
+        # the local build & plc is described in options
+        # the bonding build is described in bonding_spec
         self.test_plc = test_plc
         self.bonding_spec = bonding_spec
+        self.substrate = substrate
         self.options = options
-        # the local build & plc is described in options
-        # the bonding build is described in bonding_spec
-
     def nodefamily(self):
         return "{pldistro}-{fcdistro}-{arch}".format(**self.bonding_spec)
         
@@ -136,7 +137,7 @@ gpgcheck=0
 
         test_ssh = TestSsh (self.test_plc.vserverip)
         
-        command1 = "yum -y update"
+        command1 = "yum -y update --exclude drupal"
         if test_ssh.run (command1, dry_run = self.options.dry_run) != 0:
             return False
 
@@ -165,7 +166,7 @@ if __name__ == '__main__':
     test_plc = TestPlc (test_plc_spec)
     test_plc.show()
 
-    print test_plc.host_box
+    print(test_plc.host_box)
 
     from argparse import ArgumentParser
     parser = ArgumentParser()