summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--tests/unittests/helpers.py5
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e861be23..449f501f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
- retain trailing eol from template files (sources.list) when
rendered with jinja (LP: #1355343)
- Only use datafiles and initsys addon outside virtualenvs
+ - Fix the digital ocean test case on python 2.6
0.7.6:
- open 0.7.6
- Enable vendordata on CloudSigma datasource (LP: #1303986)
diff --git a/tests/unittests/helpers.py b/tests/unittests/helpers.py
index 9700a4ca..52305397 100644
--- a/tests/unittests/helpers.py
+++ b/tests/unittests/helpers.py
@@ -35,6 +35,11 @@ else:
if PY26:
# For now add these on, taken from python 2.7 + slightly adjusted
class TestCase(unittest.TestCase):
+ def assertIs(self, expr1, expr2, msg=None):
+ if expr1 is not expr2:
+ standardMsg = '%r is not %r' % (expr1, expr2)
+ self.fail(self._formatMessage(msg, standardMsg))
+
def assertIn(self, member, container, msg=None):
if member not in container:
standardMsg = '%r not found in %r' % (member, container)