diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-05-26 17:18:27 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-05-26 17:18:27 -0400 |
| commit | 2ddcd20267c8b1742783c46522cf257d5cd6d4fd (patch) | |
| tree | 541e58eae5495a9cc34f779a7916b3ef12f7787c /test/sql/test_selectable.py | |
| parent | 4e930a7f780f0997e8f7f9ef4efe5c57ad86efd0 (diff) | |
| parent | e2b8c893ca98bb0141405a7d7d40c4024d5bdf41 (diff) | |
| download | sqlalchemy-2ddcd20267c8b1742783c46522cf257d5cd6d4fd.tar.gz | |
Merge branch 'master' into rel_0_9
Diffstat (limited to 'test/sql/test_selectable.py')
| -rw-r--r-- | test/sql/test_selectable.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/sql/test_selectable.py b/test/sql/test_selectable.py index e697a7e08..dc0b040b0 100644 --- a/test/sql/test_selectable.py +++ b/test/sql/test_selectable.py @@ -1592,7 +1592,7 @@ class WithLabelsTest(fixtures.TestBase): def _assert_labels_warning(self, s): assert_raises_message( exc.SAWarning, - "replaced by another column with the same key", + r"replaced by Column.*, which has the same key", lambda: s.c ) |