projects
/
ganeti-local
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable-2.6'
[ganeti-local]
/
test
/
cfgupgrade_unittest.py
diff --git
a/test/cfgupgrade_unittest.py
b/test/cfgupgrade_unittest.py
index
ba54b88
..
a8eb8bc
100755
(executable)
--- a/
test/cfgupgrade_unittest.py
+++ b/
test/cfgupgrade_unittest.py
@@
-1,7
+1,7
@@
#!/usr/bin/python
#
#!/usr/bin/python
#
-# Copyright (C) 2010 Google Inc.
+# Copyright (C) 2010, 2012 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
#
# 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
@@
-285,6
+285,9
@@
class TestCfgupgrade(unittest.TestCase):
def testUpgradeFrom_2_5(self):
self._TestSimpleUpgrade(constants.BuildVersion(2, 5, 0), False)
def testUpgradeFrom_2_5(self):
self._TestSimpleUpgrade(constants.BuildVersion(2, 5, 0), False)
+ def testUpgradeFrom_2_6(self):
+ self._TestSimpleUpgrade(constants.BuildVersion(2, 6, 0), False)
+
def testUpgradeCurrent(self):
self._TestSimpleUpgrade(constants.CONFIG_VERSION, False)
def testUpgradeCurrent(self):
self._TestSimpleUpgrade(constants.CONFIG_VERSION, False)
@@
-306,6
+309,9
@@
class TestCfgupgrade(unittest.TestCase):
def testUpgradeDryRunFrom_2_5(self):
self._TestSimpleUpgrade(constants.BuildVersion(2, 5, 0), True)
def testUpgradeDryRunFrom_2_5(self):
self._TestSimpleUpgrade(constants.BuildVersion(2, 5, 0), True)
+ def testUpgradeDryRunFrom_2_6(self):
+ self._TestSimpleUpgrade(constants.BuildVersion(2, 6, 0), True)
+
def testUpgradeCurrentDryRun(self):
self._TestSimpleUpgrade(constants.CONFIG_VERSION, True)
def testUpgradeCurrentDryRun(self):
self._TestSimpleUpgrade(constants.CONFIG_VERSION, True)