Attachment 693473 Details for Bug 907810 – reboot test patch to ignore shutdown output on stderr, and upated reboot detection in log

[patch] reboot test patch to ignore shutdown output on stderr, and upated reboot detection in log

reboot.patch (text/plain), 3.11 KB, created by Greg Nichols on 2013-02-05 16:09:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2013-02-05 16:09:00 UTC

Size: 3.11 KB

patch

obsolete

>diff --git a/tests/reboot/reboot.py b/tests/reboot/reboot.py
>index 7c00fec..36f7266 100644
>--- a/tests/reboot/reboot.py
>+++ b/tests/reboot/reboot.py
>@@ -66,10 +66,9 @@ class RebootTest(Test):
>             
>         try:
>             Command("shutdown -r 0").echo()
>-        except Exception, e:
>-            print "Error: attempt to reboot failed"
>-            print e
>-            return False
>+        except V7CommandException, e:
>+            # shutdown as non-error output on stderr.  Why?
>+            pass
>                 
>         # wait here for reboot
>         waitTime = 60 #sec
>diff --git a/v7.spec.in b/v7.spec.in
>index 18657c7..2aeaae6 100644
>--- a/v7.spec.in
>+++ b/v7.spec.in
>@@ -86,7 +86,7 @@ V7 1.7.0 R3
> 
>   904134 - [RHEL7] storage test can not restore swap
>   872485 - [PATCH] v7-1.6.4 tests code clean-ups
>-  
>+  904938 - fvtest: global name 'isHvm' is not defined
> 
> * Fri Jan 25 2013 Greg Nichols <gnichols@redhat.com>
> 
>diff --git a/v7/continuation.py b/v7/continuation.py
>index 7232288..4ba6ca7 100644
>--- a/v7/continuation.py
>+++ b/v7/continuation.py
>@@ -96,7 +96,7 @@ class Continuation(Controller):
>             log = self.getSystemLog("%s-%s" % (marker, self.timestamp.strip()), pid=False)
>             rebootCount = 0
>             for line in log.split('\n'):
>-                 if self.systemLogBootMarker in line:
>+                 if "kernel:" in line and self.systemLogBootMarker in line:
>                      print line
>                      rebootCount += 1
>             if rebootCount is 0:
>diff --git a/v7/controller.py b/v7/controller.py
>index 2d9dd4c..ea55473 100644
>--- a/v7/controller.py
>+++ b/v7/controller.py
>@@ -33,7 +33,7 @@ class Controller:
>     def __init__(self, debug=Constants.off):
>         self.ui = CommandLineUI()
>         self.systemLogMarker = "v7/runtests" 
>-        self.systemLogBootMarker = "kernel: Linux version"
>+        self.systemLogBootMarker = "Linux version"
>         self.debug = debug
>         
>     def removeDirectory(self, dir):
>@@ -107,7 +107,7 @@ class Controller:
>         for l in log:
>             try:
>                 l.encode("utf-8")
>-                if l.find(self.systemLogBootMarker) >= 0:
>+                if l.find("kernel:") and l.find(self.systemLogBootMarker):
>                     marker=True
>                     # dump old contents
>                     contents = list()
>diff --git a/v7/kernelInfo.xml b/v7/kernelInfo.xml
>index ddcf987..f71567c 100644
>--- a/v7/kernelInfo.xml
>+++ b/v7/kernelInfo.xml
>@@ -1,6 +1,6 @@
> <?xml version='1.0' encoding='UTF-8'?>
> <?xml-stylesheet href="/v7/css/kernel.css" type="text/css"?>
>-<v7-kernel-info v7-version='1.5' v7-release='2'>
>+<v7-kernel-info v7-version='1.7.0' v7-release='0'>
>     <product name='Red Hat Enterprise Linux'>
>         <release number='5'>
>             <update number='0' kernel='2.6.18-8'/>
>@@ -22,6 +22,9 @@
>             <update number='3' kernel='2.6.32-279'/>
>             <update number='4' kernel='2.6.32-'/>
>         </release>
>+        <release number='7'>
>+            <update number='0' kernel='3.7.0-'/>
>+        </release>
>     </product>
>     <product name='Red Hat MRG Realtime Linux'>
>         <release number='2'>

Actions: View | Diff

Attachments on bug 907810: 693473