Merge lp:~bladernr/checkbox/1072666-improve-memory-info-output into lp:checkbox

[Jeff Lane ]

Improved the output of memory_compare to make it a bit easier to parse as well as making the final ruling more explanatory. The original text was a bit confusing.

[lp:~bladernr/checkbox/1072666-improve-memory-info-output]

2088. By Zygmunt Krynicki on 2013-04-25

"[r=roadmr][bug=][author=zkrynicki] automatic merge by tarmac"

[Zygmunt Krynicki (zyga)]

Obviously there is a rebase necessary

Thanks
ZK

review: Needs Fixing

[lp:~bladernr/checkbox/1072666-improve-memory-info-output]

2089. By Brendan Donegan on 2013-04-26

"[r=zkrynicki][bug=1173103][author=brendan-donegan] automatic merge by tarmac"

2090. By Daniel Manrique on 2013-04-26

"[r=zkrynicki][bug=][author=roadmr] plainbox sru: Better handling of server return data, particularly to output the submission status URL if it's in the response"

2091. By Brendan Donegan on 2013-04-26

Incremented version in changelog

2092. By Zygmunt Krynicki on 2013-04-26

"[r=zkrynicki][bug=1172835][author=roadmr] xml: Set OPTION_WITH_COMMENTS so they get exported. Actually set the comment when a job has OUTCOME_NOT_SUPPORTED."

2093. By Jeff Lane  on 2013-04-30

rebased

[Jeff Lane  (bladernr)]

rebased

review: Needs Resubmitting

[Zygmunt Krynicki (zyga)]

+1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-26 17:26:20 +0000
+++ debian/changelog	2013-04-30 19:59:26 +0000
@@ -31,6 +31,8 @@
     the dpkg bit verifies obexftp is installed (LP: #1169488)
   * jobs/networking.txt.in: fixed networking/info jobs that were not being run
     because $output was being resolved too early (LP: #1065983)
+  * scripts/memory_compare: cleaned up the output to be more explanatory and
+    easier to visually parse (LP: #1072666)
 
   [ Daniel Manrique ]
   * scripts/alsa_record_playback: Replaced alsasrc with autoaudiosrc

=== modified file 'scripts/memory_compare'
--- scripts/memory_compare	2012-12-11 18:16:13 +0000
+++ scripts/memory_compare	2013-04-30 19:59:26 +0000
@@ -55,20 +55,23 @@
     try:
         percentage = difference / installed_memory * 100
     except ZeroDivisionError:
-        print("FAIL: Either dmi or /proc/meminfo returned a memory size of 0 kB", file=sys.stderr)
+        print("Results:")
         print("\t/proc/meminfo reports:\t%s kB" % visible_memory, file=sys.stderr)
         print("\tdmi reports:\t%s kB" % installed_memory, file=sys.stderr)
+        print("\nFAIL: Either dmi or /proc/meminfo returned a memory size of 0 kB", file=sys.stderr)
         return 1
     
     if percentage <= THRESHOLD:
-        print("PASS: Difference is %d bytes (%.2f%%) and less than the %d%% threshold." % (difference, percentage, THRESHOLD))
+        print("Results:")
         print("\t/proc/meminfo reports:\t%s kB" % visible_memory)
         print("\tdmi reports:\t%s kB" % installed_memory)
+        print("\nPASS: Meminfo reports %d bytes less than DMI, a difference of %.2f%%. This is less than the %d%% variance allowed." % (difference, percentage, THRESHOLD))
         return 0
     else:
-        print("FAIL: Difference is %d bytes (%.2f%%) and greater than the %d%% threshold." % (difference, percentage, THRESHOLD), file=sys.stderr)
+        print("Results")
         print("\t/proc/meminfo reports:\t%s kB" % visible_memory, file=sys.stderr)
         print("\tdmi reports:\t%s kB" % installed_memory, file=sys.stderr)
+        print("\nFAIL: Meminfo reports %d bytes less than DMI, a difference of %.2f%%. Only a variance of %d%% in reported memory is allowed." % (difference, percentage, THRESHOLD), file=sys.stderr)
         return 1
 
 if __name__ == "__main__":