Browse Source

fixed some unittests

master
lars 15 years ago
parent
commit
5ea8e7836d
  1. 1
      changelog
  2. 3
      plugins/encrypted_webinterface/unittests.py
  3. 2
      plugins/language_selection/unittests.py
  4. 10
      plugins/network/unittests.py
  5. 2
      plugins/user_manager/unittests.py
  6. 2
      plugins/volume_mount/unittests.py
  7. 2
      plugins/volume_rename/unittests.py
  8. 2
      src/cryptobox/core/settings.py
  9. 18
      src/cryptobox/plugins/base.py
  10. 4
      src/cryptobox/tests/test.cryptobox.py
  11. 4
      templates/language.hdf

1
changelog

@ -2,6 +2,7 @@ Version 0.3.3 - 01/26/02007
* fixed bug in reinitializing of plugins (Closes: #111)
* fixed broken group membership changing of webserver (Closes: #114)
* fixed glitch that delayed the effect of changes made by the plugin_manager
* ignore devices without read and write permissions
* completed Slovenian translation
* improved German translation
* added: restore network settings during startup

3
plugins/encrypted_webinterface/unittests.py

@ -29,5 +29,6 @@ class unittests(WebInterfaceTestClass):
url = self.url + "encrypted_webinterface"
self.register_auth(url)
self.cmd.go(url)
self.cmd.find("Data.Status.Plugins.encrypted_webinterface")
## TODO: enable it, as soon as the plugin is enabled by default
#self.cmd.find("Data.Status.Plugins.encrypted_webinterface")

2
plugins/language_selection/unittests.py

@ -30,7 +30,7 @@ class unittests(WebInterfaceTestClass):
url = self.url + "language_selection?weblang=en"
self.register_auth(url)
self.cmd.go(url)
self.cmd.find('Choose an interface language')
self.cmd.find('Choose your tongue')
def test_check_language_list(self):

10
plugins/network/unittests.py

@ -46,10 +46,10 @@ class unittests(WebInterfaceTestClass):
self.assertEquals(4, len(orig_ip_octs))
def set_ip((ip1, ip2, ip3, ip4)):
self.cmd.go(self.url + "network")
self.cmd.formvalue("set_ip", "ip1", str(ip1))
self.cmd.formvalue("set_ip", "ip2", str(ip2))
self.cmd.formvalue("set_ip", "ip3", str(ip3))
self.cmd.formvalue("set_ip", "ip4", str(ip4))
self.cmd.formvalue("network_address", "ip1", str(ip1))
self.cmd.formvalue("network_address", "ip2", str(ip2))
self.cmd.formvalue("network_address", "ip3", str(ip3))
self.cmd.formvalue("network_address", "ip4", str(ip4))
self.cmd.submit()
## sleep a little bit longer than the delay necessary for ip-change
time.sleep(CHANGE_IP_DELAY + 3)
@ -73,6 +73,6 @@ class unittests(WebInterfaceTestClass):
self.register_auth(self.url + "network")
self.cmd.go(self.url + "network" + "?redirected=1")
self.cmd.notfind("problem")
self.cmd.go(self.url + "network" + "?store=1")
self.cmd.go(self.url + "network" + "?store=set_ip")
self.cmd.find("invalid network address")

2
plugins/user_manager/unittests.py

@ -31,7 +31,7 @@ class unittests(WebInterfaceTestClass):
def test_read_users(self):
"""does the 'admin' user exist?"""
cur_users = self._getUsers()
self.cmd.find("Manage users")
self.cmd.find("Add new user")
self.assertTrue("admin" in cur_users)

2
plugins/volume_mount/unittests.py

@ -35,7 +35,7 @@ class unittests(WebInterfaceTestClass):
url = self.url + "volume_mount?weblang=en&device=" + self.device_html
self.register_auth(url)
self.cmd.go(url)
self.cmd.find('Open volume')
self.cmd.find('Open this volume')
self.cmd.find('Data.Status.Plugins.volume_mount=passive')

2
plugins/volume_rename/unittests.py

@ -34,7 +34,7 @@ class unittests(WebInterfaceTestClass):
cbox_tools.umount(self.device)
## check a language string
self.cmd.go(url)
self.cmd.find('Change the name of this volume')
self.cmd.find('Change name')
def test_rename(self):

2
src/cryptobox/core/settings.py

@ -51,6 +51,8 @@ class CryptoBoxSettings:
config_file = self.__get_config_filename(config_file)
self.log.info("loading config file: %s" % config_file)
self.prefs = self.__get_preferences(config_file)
if not "PluginSettings" in self.prefs:
self.prefs["PluginSettings"] = {}
self.__validate_config()
self.__configure_log_handler()
self.__check_unknown_preferences()

18
src/cryptobox/plugins/base.py

@ -56,7 +56,23 @@ class CryptoBoxPlugin:
def __init__(self, cbox, plugin_dir, site_class=None):
self.cbox = cbox
if cbox:
self.cbox = cbox
else:
## define empty dummy class as a replacement for a cbox instance
class CBoxPrefs(dict):
plugin_conf = {}
class CBoxLogger:
def debug(self, text):
pass
info = debug
warn = debug
error = debug
class CBoxMinimal:
prefs = CBoxPrefs()
prefs["PluginSettings"] = {}
log = CBoxLogger()
self.cbox = CBoxMinimal()
self.hdf = {}
self.plugin_dir = plugin_dir
self.hdf_prefix = "Data.Plugins.%s." % self.get_name()

4
src/cryptobox/tests/test.cryptobox.py

@ -41,9 +41,7 @@ class CryptoBoxDeviceTests(CommonTestClass):
def test_allowed_devices(self):
'''is_device_allowed should accept permitted devices'''
self.assertTrue(self.cb.is_device_allowed("/dev/loop"))
self.assertTrue(self.cb.is_device_allowed("/dev/loop1"))
self.assertTrue(self.cb.is_device_allowed("/dev/loop/urgd"))
self.assertTrue(self.cb.is_device_allowed("/dev/usb/../loop1"))
@ -52,6 +50,8 @@ class CryptoBoxDeviceTests(CommonTestClass):
self.assertFalse(self.cb.is_device_allowed("/dev/hda"))
self.assertFalse(self.cb.is_device_allowed("/dev/loopa/../hda"))
self.assertFalse(self.cb.is_device_allowed("/"))
## this device does not exist -> no permission check possible
self.assertFalse(self.cb.is_device_allowed("/dev/loop"))

4
templates/language.hdf

@ -27,8 +27,8 @@ Button {
AdviceMessage {
VolumeIsBusy {
Title = Disk is busy
Text = This disk is currently busy. Please wait for a moment.
Title = Busy volume
Text = This volume is currently busy. Please wait for a moment.
Link.Rel = /
Link.Text = Show all disks
}

Loading…
Cancel
Save