From 638262b96feef48e56da0d95f8dd3686092c5ae3 Mon Sep 17 00:00:00 2001 From: Sergey Motornyuk Date: Tue, 1 Aug 2017 14:28:24 +0300 Subject: [PATCH] Updated CHANGELOG and fixed test_none_root --- CHANGELOG.rst | 2 +- ckan/tests/test_none_root.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 830bed31868..43358aa4219 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -8,7 +8,7 @@ Changelog --------- v2.7.0 2017-08-02 -========== +================= Note: Starting from this version, CKAN requires at least Postgres 9.3 diff --git a/ckan/tests/test_none_root.py b/ckan/tests/test_none_root.py index 7ee1d220697..c9783660c45 100644 --- a/ckan/tests/test_none_root.py +++ b/ckan/tests/test_none_root.py @@ -14,6 +14,7 @@ def test_resource_url(self): app = webtest.TestApp(wsgiapp) p.load(u'example_theme_v15_fanstatic') content = app.get(u'/en/base.html') - assert u'example_theme.css' in content + if u'example_theme.css' not in content: + assert u'example_theme.min.css' in content assert u'href="/data/fanstatic/example_theme' in content p.unload(u'example_theme_v15_fanstatic')