summaryrefslogtreecommitdiff
path: root/nose
diff options
context:
space:
mode:
authorkumar <kumar.mcmillan@gmail.com>2011-04-19 13:48:26 -0500
committerkumar <kumar.mcmillan@gmail.com>2011-04-19 13:48:26 -0500
commit90931eea8203f9115783f0f9ca50c235e649fcbb (patch)
tree6667d0d7c97aaff005df5f77ee6cbee08c3c7a66 /nose
parent5f7f5b5e8d0001238137b15ecc4b719d5d244c00 (diff)
parentbf7ab7b3409a5afb199eeff61788875b79ebb5ef (diff)
downloadnose-90931eea8203f9115783f0f9ca50c235e649fcbb.tar.gz
Merged with multiprocess branch (see Issue 399)
Diffstat (limited to 'nose')
-rw-r--r--nose/suite.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nose/suite.py b/nose/suite.py
index 57ee483..3b68b23 100644
--- a/nose/suite.py
+++ b/nose/suite.py
@@ -531,8 +531,8 @@ class ContextSuiteFactory(object):
remain.append(test)
if common:
suite = self.makeSuite(common, ancestor)
- tail = remain
- return [suite] + self.mixedSuites(tail)
+ tail = self.mixedSuites(remain)
+ return [suite] + tail
def wrapTests(self, tests):
log.debug("wrap %s", tests)