summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-02-19 11:37:18 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-02-19 11:37:27 +0000
commit2f8e5403cd21d18e14eedf124bd2270516dcac61 (patch)
tree11ddb5d144f992f4e57ec6826e08b83fddb5a457
parent8018ad12ddea1fbdbb21f4b3a198b553b92e4c41 (diff)
downloadsystem-tests-2f8e5403cd21d18e14eedf124bd2270516dcac61.tar.gz
Fix silliness
-rw-r--r--test_trove_upgrades.py2
-rw-r--r--util.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/test_trove_upgrades.py b/test_trove_upgrades.py
index b564709..a6d940b 100644
--- a/test_trove_upgrades.py
+++ b/test_trove_upgrades.py
@@ -331,7 +331,7 @@ class SystemTestBranch(object):
Uses `morph edit` and `git reset` to achieve this.
'''
chunk_repo_uri, original_ref = self.get_repo_and_ref_for_chunk(
- branch, stratum, chunk)
+ stratum, chunk)
with set_directory(self.morphs_dir):
run_morph(['edit', system, stratum, chunk])
diff --git a/util.py b/util.py
index 8974674..15c9c72 100644
--- a/util.py
+++ b/util.py
@@ -17,6 +17,7 @@
import cliapp
import contextlib
+import os
import sys
import urlparse