The previous merge went a bit wrong, and left the libraries unsynced with the tools; This commit fixes it.

This commit is contained in:
Brian Fraser fraserb@gmail.com
2012-04-02 13:36:17 -03:00
parent 761f8a5aac
commit 6dbbd6de3b
6 changed files with 29 additions and 49 deletions

View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash
plan 49
plan 48
. "$LIB_DIR/alt_cmds.sh"
. "$LIB_DIR/log_warn_die.sh"
@@ -1267,21 +1267,16 @@ is \
# parse_lvs
is \
"$(format_lvs "" "" "")" \
"Cannot execute 'lvs'" \
"$(format_lvs "" "")" \
"Unable to collect information" \
"format_lvs has a meaningful error message if all goes wrong"
echo "There was an error..." > "$TMPDIR/in"
like \
"$(format_lvs "$TMPDIR/some_file_that_does_not_exist" "" "$TMPDIR/in")" \
"lvs didn't output anything and had the following errors:" \
"format_lvs shows the stderr of lvs if the lvs file doesn't exist"
echo "Pretending to be an lvs dump" > "$TMPDIR/in"
is \
"$(format_lvs "$TMPDIR/in" "" "")" \
"$(format_lvs "$TMPDIR/in" "")" \
"Pretending to be an lvs dump" \
"format_lvs has a meaningful error message if all goes wrong"
"format_lvs dumps the file passed in"
# report_system_summary
parse_options "$BIN_DIR/pt-summary"
@@ -1514,6 +1509,8 @@ dentry-state | 78471 67588 45 0 0 0
inode-nr | 70996 10387
# LVM Volumes ################################################
No volume groups found
# LVM Volume Groups ##########################################
Unable to collect information
# RAID Controller ############################################
Controller | No RAID controller detected
# Network Config #############################################