From 3c153ae6291a2db16339fdcb94ddc806c4be9422 Mon Sep 17 00:00:00 2001 From: Sylvain Pineau Date: Mon, 30 Jan 2017 14:20:45 +0100 Subject: Bump to v0.34.0rc1 --- .bumpversion.cfg | 2 +- manage.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 9ee5990..fa19406 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.34.0.dev0 +current_version = 0.34.0rc1 files = manage.py parse = (?P\d+)\.(?P\d+)(\.(?P\d+))?((?P\.?[a-z]+)(?P\d+))? serialize = diff --git a/manage.py b/manage.py index 12e00a9..9818362 100755 --- a/manage.py +++ b/manage.py @@ -30,7 +30,7 @@ class InstallPyModules(InstallCommand): setup( name='plainbox-provider-checkbox', namespace='2013.com.canonical.certification', - version="0.34.0.dev0", + version="0.34.0rc1", description=N_("Checkbox provider"), gettext_domain='plainbox-provider-checkbox', strict=False, deprecated=False, -- cgit v1.2.3 From fe5821a3c1266d814ac58a8cc27dec7c73b57da0 Mon Sep 17 00:00:00 2001 From: Jeff Lane Date: Tue, 31 Jan 2017 10:57:10 -0500 Subject: disk_stats_test: less output, better failure output, fixed grep issue when there are two disks with similar names LP: #1660653 --- bin/disk_stats_test | 60 +++++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/bin/disk_stats_test b/bin/disk_stats_test index 851dff7..3c88a6c 100755 --- a/bin/disk_stats_test +++ b/bin/disk_stats_test @@ -4,11 +4,21 @@ #and is properly represented. Defaults to sda if not passed a disk at run time DISK="sda" +STATUS=0 check_return_code() { if [ "${1}" -ne "0" ]; then echo "ERROR: retval ${1} : ${2}" >&2 - exit ${1} + if [[ $STATUS -eq 0 ]]; then + STATUS=${1} + fi + if [ $# -gt 2 ]; then + shift + shift + for item in "$@"; do + echo "output: "$item + done + fi fi } @@ -16,53 +26,45 @@ if [[ "$1" != '' ]]; then DISK="$1" fi -#Get some baseline stats for use later -echo "Getting baseline stats" -PROC_STAT_BEGIN=`grep -m 1 $DISK /proc/diskstats` -SYS_STAT_BEGIN=`cat /sys/block/$DISK/stat` - -#Generate some disk activity using hdparm -t -echo "Generating some disk activity" -hdparm -t "/dev/$DISK" 2&> /dev/null - -#Sleep 5 to let the stats files catch up -sleep 5 - #Check /proc/partitions, exit with fail if disk isn't found -echo "Checking /proc/partitions" -grep -q $DISK /proc/partitions +grep -w -q $DISK /proc/partitions check_return_code $? "Disk $DISK not found in /proc/partitions" #Next, check /proc/diskstats -echo "Checking /proc/diskstats" -grep -q -m 1 $DISK /proc/diskstats +grep -w -q -m 1 $DISK /proc/diskstats check_return_code $? "Disk $DISK not found in /proc/diskstats" #Verify the disk shows up in /sys/block/ -echo "Checking /sys/block" -ls /sys/block | grep -q $DISK +ls /sys/block | grep -w -q $DISK check_return_code $? "Disk $DISK not found in /sys/block" #Verify there are stats in /sys/block/$DISK/stat -echo "Checking /sys/block/$DISK/stat" [[ -s "/sys/block/$DISK/stat" ]] check_return_code $? "stat is either empty or nonexistant in /sys/block/$DISK/" +#Get some baseline stats for use later +PROC_STAT_BEGIN=`grep -w -m 1 $DISK /proc/diskstats` +SYS_STAT_BEGIN=`cat /sys/block/$DISK/stat` + +#Generate some disk activity using hdparm -t +hdparm -t "/dev/$DISK" 2&> /dev/null + #Sleep 5 to let the stats files catch up sleep 5 #Make sure the stats have changed: -echo "Getting ending stats" -PROC_STAT_END=`grep -m 1 $DISK /proc/diskstats` +PROC_STAT_END=`grep -w -m 1 $DISK /proc/diskstats` SYS_STAT_END=`cat /sys/block/$DISK/stat` -echo "Checking /proc/diskstats for changes" [[ "$PROC_STAT_BEGIN" != "$PROC_STAT_END" ]] -check_return_code $? "Stats in /proc/diskstats did not change" +check_return_code $? "Stats in /proc/diskstats did not change" \ + "$PROC_STAT_BEGIN" "$PROC_STAT_END" -echo "Checking /sys/block/$DISK/stat for changes" -[[ "$SYS_STAT_BEGIN" != "$SYS_STAT_END" ]] -check_return_code $? "Stats in /sys/block/$DISK/stat did not change" +check_return_code $? "Stats in /sys/block/$DISK/stat did not change" \ + "$SYS_STAT_BEGIN" "$SYS_STAT_END" + +if [[ $STATUS -eq 0 ]]; then + echo "PASS: Finished testing stats for $DISK" +fi -echo "PASS: Finished testing stats for $DISK" -exit 0 +exit $STATUS -- cgit v1.2.3 From e35da1b8a0aa303fd13087c7478dc2a5415016f6 Mon Sep 17 00:00:00 2001 From: Sylvain Pineau Date: Tue, 31 Jan 2017 18:43:12 +0100 Subject: Bump to v0.34.0rc2 --- .bumpversion.cfg | 2 +- manage.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index fa19406..cea5774 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.34.0rc1 +current_version = 0.34.0rc2 files = manage.py parse = (?P\d+)\.(?P\d+)(\.(?P\d+))?((?P\.?[a-z]+)(?P\d+))? serialize = diff --git a/manage.py b/manage.py index 9818362..3e10215 100755 --- a/manage.py +++ b/manage.py @@ -30,7 +30,7 @@ class InstallPyModules(InstallCommand): setup( name='plainbox-provider-checkbox', namespace='2013.com.canonical.certification', - version="0.34.0rc1", + version="0.34.0rc2", description=N_("Checkbox provider"), gettext_domain='plainbox-provider-checkbox', strict=False, deprecated=False, -- cgit v1.2.3 From 5c4661c14442935917f7e078219ca495cfd69ff7 Mon Sep 17 00:00:00 2001 From: Sylvain Pineau Date: Fri, 3 Feb 2017 11:26:56 +0100 Subject: Bump to v0.34.0 --- .bumpversion.cfg | 2 +- manage.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index cea5774..cf95996 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.34.0rc2 +current_version = 0.34.0 files = manage.py parse = (?P\d+)\.(?P\d+)(\.(?P\d+))?((?P\.?[a-z]+)(?P\d+))? serialize = diff --git a/manage.py b/manage.py index 3e10215..cbc5509 100755 --- a/manage.py +++ b/manage.py @@ -30,7 +30,7 @@ class InstallPyModules(InstallCommand): setup( name='plainbox-provider-checkbox', namespace='2013.com.canonical.certification', - version="0.34.0rc2", + version="0.34.0", description=N_("Checkbox provider"), gettext_domain='plainbox-provider-checkbox', strict=False, deprecated=False, -- cgit v1.2.3 From 3cd4fd7e2e4cff416c3a48411ae5fb0c5315fd30 Mon Sep 17 00:00:00 2001 From: Sylvain Pineau Date: Fri, 3 Feb 2017 11:26:57 +0100 Subject: increment version to v0.35.0.dev0 --- .bumpversion.cfg | 2 +- manage.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index cf95996..aec6c1a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.34.0 +current_version = 0.35.0.dev0 files = manage.py parse = (?P\d+)\.(?P\d+)(\.(?P\d+))?((?P\.?[a-z]+)(?P\d+))? serialize = diff --git a/manage.py b/manage.py index cbc5509..86fb301 100755 --- a/manage.py +++ b/manage.py @@ -30,7 +30,7 @@ class InstallPyModules(InstallCommand): setup( name='plainbox-provider-checkbox', namespace='2013.com.canonical.certification', - version="0.34.0", + version="0.35.0.dev0", description=N_("Checkbox provider"), gettext_domain='plainbox-provider-checkbox', strict=False, deprecated=False, -- cgit v1.2.3