From 0eccca7d226a74e805915e78aa2acbb33f234702 Mon Sep 17 00:00:00 2001 From: lars Date: Mon, 14 Jan 2008 20:48:23 +0000 Subject: [PATCH] use short device name for tests update order and content of default test block devices --- src/cryptobox/tests/base.py | 3 ++- src/cryptobox/tests/tools.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/cryptobox/tests/base.py b/src/cryptobox/tests/base.py index 8cfb74f..0ebf44f 100644 --- a/src/cryptobox/tests/base.py +++ b/src/cryptobox/tests/base.py @@ -78,7 +78,8 @@ class CommonTestClass(unittest.TestCase): self.blockdevice = testtools.find_test_device() self.device = self.blockdevice + "1" self.blockdevice_html = self.blockdevice.replace("/", "%2F") - self.device_html = self.device.replace("/", "%2F") + ## the assumption is not always valid - but usually it is ok + self.device_html = os.path.basename(self.device) ## remove configuration files ## first: retrieve the settings directory diff --git a/src/cryptobox/tests/tools.py b/src/cryptobox/tests/tools.py index 5031195..ddb201f 100644 --- a/src/cryptobox/tests/tools.py +++ b/src/cryptobox/tests/tools.py @@ -26,7 +26,7 @@ just inherit one of its classes and add some test functions __revision__ = "$Id$" -TEST_DEVICE_LIST = ["hda", "hdb", "ubdb", "loop", "ubda", "udbc", "ubdd", "sd"] +TEST_DEVICE_LIST = ["ubdb", "loop", "ubda", "udbc", "ubdd", "sd"] import os