Wrong file name in Makefile.am and wrong naming (.unittest vs
_unittest).
---
Makefile.am | 2 +-
test/ganeti.hypervisor.unittest.py | 52 ------------------------------------
test/ganeti.hypervisor_unittest.py | 52 ++++++++++++++++++++++++++++++++++++
3 files changed, 53 insertions(+), 53 deletions(-)
delete mode 100644 test/ganeti.hypervisor.unittest.py
create mode 100755 test/ganeti.hypervisor_unittest.py
diff --git a/Makefile.am b/Makefile.am
index 3a95192..8f39bd3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -431,7 +431,7 @@ python_tests = \
test/ganeti.errors_unittest.py \
test/ganeti.hooks_unittest.py \
test/ganeti.http_unittest.py \
- test/ganeti.hypervisor.py \
+ test/ganeti.hypervisor_unittest.py \
test/ganeti.hypervisor.hv_kvm_unittest.py \
test/ganeti.impexpd_unittest.py \
test/ganeti.jqueue_unittest.py \
diff --git a/test/ganeti.hypervisor.unittest.py
b/test/ganeti.hypervisor.unittest.py
deleted file mode 100644
index c046f8e..0000000
--- a/test/ganeti.hypervisor.unittest.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/python
-#
-
-# Copyright (C) 2010 Google Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-
-"""Script for testing hypervisor functionality"""
-
-import unittest
-
-from ganeti import constants
-from ganeti import compat
-from ganeti import objects
-from ganeti import errors
-from ganeti import hypervisor
-
-import testutils
-
-
-class TestParameters(unittest.TestCase):
- def test(self):
- for hv, const_params in constants.HVC_DEFAULTS.items():
- hyp = hypervisor.GetHypervisorClass(hv)
- for pname in const_params:
- self.assertTrue(pname in hyp.PARAMETERS,
- "Hypervisor %s: parameter %s defined in constants"
- " but not in the permitted hypervisor parameters" %
- (hv, pname))
- for pname in hyp.PARAMETERS:
- self.assertTrue(pname in const_params,
- "Hypervisor %s: parameter %s defined in the hypervisor"
- " but missing a default value" %
- (hv, pname))
-
-
-if __name__ == "__main__":
- testutils.GanetiTestProgram()
diff --git a/test/ganeti.hypervisor_unittest.py
b/test/ganeti.hypervisor_unittest.py
new file mode 100755
index 0000000..c046f8e
--- /dev/null
+++ b/test/ganeti.hypervisor_unittest.py
@@ -0,0 +1,52 @@
+#!/usr/bin/python
+#
+
+# Copyright (C) 2010 Google Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+
+"""Script for testing hypervisor functionality"""
+
+import unittest
+
+from ganeti import constants
+from ganeti import compat
+from ganeti import objects
+from ganeti import errors
+from ganeti import hypervisor
+
+import testutils
+
+
+class TestParameters(unittest.TestCase):
+ def test(self):
+ for hv, const_params in constants.HVC_DEFAULTS.items():
+ hyp = hypervisor.GetHypervisorClass(hv)
+ for pname in const_params:
+ self.assertTrue(pname in hyp.PARAMETERS,
+ "Hypervisor %s: parameter %s defined in constants"
+ " but not in the permitted hypervisor parameters" %
+ (hv, pname))
+ for pname in hyp.PARAMETERS:
+ self.assertTrue(pname in const_params,
+ "Hypervisor %s: parameter %s defined in the hypervisor"
+ " but missing a default value" %
+ (hv, pname))
+
+
+if __name__ == "__main__":
+ testutils.GanetiTestProgram()
--
1.7.2.3
