summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@jelmer.uk>2018-04-13 00:30:05 +0100
committerGitHub <noreply@github.com>2018-04-13 00:30:05 +0100
commit3fb5902b2011859ce3f3e96fdd1db700ae65377c (patch)
tree34551117ce50c55731e5373b921df38763b68c0c
parentb8b78599856a1c59285446ffc6b34e8bec8f2387 (diff)
parent5ba2819498be5b7616cbb14dec40336455a600f1 (diff)
downloadtestrepository-git-3fb5902b2011859ce3f3e96fdd1db700ae65377c.tar.gz
Merge pull request #38 from jelmer/fix-travis
Fix tests with pypy2 on travis.
-rw-r--r--.travis.yml2
-rw-r--r--testrepository/tests/commands/test_load.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index d8caad9..cff1558 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ python:
- "3.4"
- "3.5"
- "3.6"
- - "pypy2.7"
+ - "pypy"
- "pypy3.5"
matrix:
include:
diff --git a/testrepository/tests/commands/test_load.py b/testrepository/tests/commands/test_load.py
index 11c42d7..a0c2947 100644
--- a/testrepository/tests/commands/test_load.py
+++ b/testrepository/tests/commands/test_load.py
@@ -232,10 +232,10 @@ class TestCommandLoad(ResourcedTestCase):
cmd.repository_factory.initialise(ui.here)
ret = cmd.execute()
self.assertEqual(
+ ui.outputs,
[('results', Wildcard),
('summary', False, 1, None, None, None,
- [('id', 0, None), ('failures', 1, None)])],
- ui.outputs)
+ [('id', 0, None), ('failures', 1, None)])])
self.assertEqual(1, ret)
def test_partial_passed_to_repo(self):