← Back to branch summary

~jimbaker/pyjuju/ssh-known_hosts

« back to all changes in this revision

Viewing changes to juju/lib/tests/test_zk.py

  • Committer: Gustavo Niemeyer
  • Date: 2011-09-16 00:36:31 UTC
  • mto: This revision was merged to the branch mainline in revision 349.
  • Revision ID: gustavo@niemeyer.net-20110916003631-4g3p7ycpisxbi3eu
Fixed several broken tests, including some coming from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
juju/lib/tests/test_zk.py
82
82
        self.assertIn("/usr/share/java/log4j-1.2.jar", class_path)
83
83
        self.assertIn("/usr/share/java/zookeeper.jar", class_path)
84
84
 
85
 
    if not check_zookeeper():
86
 
        test_get_class_path_from_package.skip = "Not installed"
87
 
 
88
85
    def test_get_zookeeper_variables(self):
89
86
        """All data files are contained in the specified directory.
90
87
        """
119
116
        self.assertFalse(os.path.exists(data_dir))
120
117
 
121
118
    if not check_zookeeper():
122
 
        test_managed_zookeeper.skip = "Not installed"
 
119
        notinst = "Zookeeper not installed in the system"
 
120
        test_managed_zookeeper.skip = notinst
 
121
        test_get_class_path_from_package_static.skip = notinst
 
122
        test_get_zookeeper_variables.skip = notinst
 
123
        test_get_class_path_from_package.skip = notinst