Skip to content

Commit

Permalink
[fc] Repository: plone.app.theming
Browse files Browse the repository at this point in the history
Branch: refs/heads/master
Date: 2015-07-10T11:22:07Z
Author: Guido A.J. Stevens (gyst) <guido.stevens@cosent.nl>
Commit: plone/plone.app.theming@e8d1ccc

improve test isolation

Files changed:
M src/plone/app/theming/tests/test_policy.py
Repository: plone.app.theming
Branch: refs/heads/master
Date: 2015-07-10T07:45:32-05:00
Author: Nathan Van Gheem (vangheem) <vangheem@gmail.com>
Commit: plone/plone.app.theming@ee62744

Merge pull request #64 from ploneintranet/master

improve test isolation

Files changed:
M src/plone/app/theming/tests/test_policy.py
  • Loading branch information
vangheem committed Jul 10, 2015
1 parent 186bc5d commit 52fba6e
Showing 1 changed file with 82 additions and 14 deletions.
96 changes: 82 additions & 14 deletions last_commit.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,90 @@
Repository: Products.TinyMCE
Repository: plone.app.theming


Branch: refs/heads/master
Date: 2015-07-10T09:48:25+02:00
Author: Harald Friessnegger (frisi) <harald@webmeisterei.com>
Commit: https://github.com/plone/Products.TinyMCE/commit/01ef03ed80cc5090074a3c6e18d7916ebabac486
Date: 2015-07-10T11:22:07Z
Author: Guido A.J. Stevens (gyst) <guido.stevens@cosent.nl>
Commit: https://github.com/plone/plone.app.theming/commit/e8d1cccd59a14811965fee27f75529acb5cd1c2c

correct documentation url
improve test isolation

Files changed:
M README.rst

diff --git a/README.rst b/README.rst
index 1604735..950fb06 100644
--- a/README.rst
+++ b/README.rst
@@ -1 +1 @@
-Documentation at http://readthedocs.org/docs/productstinymce/
+Documentation at https://productstinymce.readthedocs.org/en/latest/
M src/plone/app/theming/tests/test_policy.py

diff --git a/src/plone/app/theming/tests/test_policy.py b/src/plone/app/theming/tests/test_policy.py
index 258f5c4..c23f926 100644
--- a/src/plone/app/theming/tests/test_policy.py
+++ b/src/plone/app/theming/tests/test_policy.py
@@ -1,6 +1,5 @@
# -*- coding: utf-8 -*-
import time
-import multiprocessing
import threading
import transaction
import unittest2 as unittest
@@ -16,10 +15,16 @@ class TestFunctional(unittest.TestCase):

layer = THEMING_FUNCTIONAL_TESTING

+ def setUp(self):
+ request = self.layer['request']
+ policy = theming_policy(request)
+ # avoid cache pollution from other tests
+ policy.invalidateCache()
+
def tearDown(self):
request = self.layer['request']
policy = theming_policy(request)
- # static class attribute is cached across test runs
+ # clear local thread caches
policy.invalidateCache()

def test_getSettings(self):


Repository: plone.app.theming


Branch: refs/heads/master
Date: 2015-07-10T07:45:32-05:00
Author: Nathan Van Gheem (vangheem) <vangheem@gmail.com>
Commit: https://github.com/plone/plone.app.theming/commit/ee62744b1b3430f60e02a315d2477454c60bcf3e

Merge pull request #64 from ploneintranet/master

improve test isolation

Files changed:
M src/plone/app/theming/tests/test_policy.py

diff --git a/src/plone/app/theming/tests/test_policy.py b/src/plone/app/theming/tests/test_policy.py
index 258f5c4..c23f926 100644
--- a/src/plone/app/theming/tests/test_policy.py
+++ b/src/plone/app/theming/tests/test_policy.py
@@ -1,6 +1,5 @@
# -*- coding: utf-8 -*-
import time
-import multiprocessing
import threading
import transaction
import unittest2 as unittest
@@ -16,10 +15,16 @@ class TestFunctional(unittest.TestCase):

layer = THEMING_FUNCTIONAL_TESTING

+ def setUp(self):
+ request = self.layer['request']
+ policy = theming_policy(request)
+ # avoid cache pollution from other tests
+ policy.invalidateCache()
+
def tearDown(self):
request = self.layer['request']
policy = theming_policy(request)
- # static class attribute is cached across test runs
+ # clear local thread caches
policy.invalidateCache()

def test_getSettings(self):


0 comments on commit 52fba6e

Please sign in to comment.