From 2ba6930d62263a39f150ab43bf8cd860b9245188 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Thu, 2 Jan 2014 22:42:17 +0100 Subject: [PATCH] ceph-disk: cannot run unit tests Because ceph-disk relies on hardcoded paths. The corresponding test will be added back when ceph-disk can run from sources. Fixes: #7085 Signed-off-by: Loic Dachary --- src/test/cli/ceph-disk/data-dir.t | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 src/test/cli/ceph-disk/data-dir.t diff --git a/src/test/cli/ceph-disk/data-dir.t b/src/test/cli/ceph-disk/data-dir.t deleted file mode 100644 index a0bb563f2a1..00000000000 --- a/src/test/cli/ceph-disk/data-dir.t +++ /dev/null @@ -1,22 +0,0 @@ - $ uuid=$(uuidgen) - $ export CEPH_CONF=$TESTDIR/ceph.conf - $ echo "[global]\nfsid = $uuid\nosd_data = $TESTDIR/osd-data\n" > $CEPH_CONF - $ osd_data=$(ceph-conf osd_data) - $ mkdir $osd_data -# a failure to create the fsid file implies the magic file is not created - $ mkdir $osd_data/fsid - $ ceph-disk --verbose prepare $osd_data 2>&1 | grep 'Is a directory' - OSError: [Errno 21] Is a directory - $ ! [ -f $osd_data/magic ] - $ rmdir $osd_data/fsid -# successfully prepare the OSD - $ ceph-disk --verbose prepare $osd_data - DEBUG:ceph-disk:Preparing osd data dir .* (re) - $ grep $uuid $osd_data/ceph_fsid > /dev/null - $ [ -f $osd_data/magic ] -# will not override an existing OSD - $ echo "[global]\nfsid = $(uuidgen)\nosd_data = $TESTDIR/osd-data\n" > $CEPH_CONF - $ ceph-disk --verbose prepare $osd_data - DEBUG:ceph-disk:Data dir .* already exists (re) - $ grep $uuid $osd_data/ceph_fsid > /dev/null - $ rm -fr $osd_data $TESTDIR/ceph.conf -- 2.47.3