diff options
| author | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2014-02-13 15:47:58 +0000 |
|---|---|---|
| committer | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2014-02-13 15:54:13 +0000 |
| commit | 16c5f7ba4344e53ad18bb2b3e4e5fc8a11b2cc5c (patch) | |
| tree | 90c891ccc0576dcbd94bce594eb6164515b3c9fc | |
| parent | 11e4d301a4da91dd5f459fd9fb8296a320cf7b18 (diff) | |
| download | system-tests-16c5f7ba4344e53ad18bb2b3e4e5fc8a11b2cc5c.tar.gz | |
fix
| -rwxr-xr-x | test_trove_upgrades.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/test_trove_upgrades.py b/test_trove_upgrades.py index c59e774..b18195d 100755 --- a/test_trove_upgrades.py +++ b/test_trove_upgrades.py @@ -481,12 +481,15 @@ class TestUpgrades(BaseTestSuite): run_git(['reset', '--hard', tag], cwd=chunk_dir) build_morph_name = 'lighttpd.morph' - build_morph = run_git(['cat-file', 'blob', BRANCH + ':' + build_morph_name]) + build_morph = run_git( + ['cat-file', 'blob', BRANCH + ':' + build_morph_name], + cwd=chunk_dir) - with open(os.path.join(chunk_dir, build_morph_name)) as f: + with open(os.path.join(chunk_dir, build_morph_name), 'w') as f: f.write(build_morph) - run_git(['commit', '-m', 'Add lighttpd.morph'], cwd=branch.morphs_dir) + run_git(['add', build_morph_name], cwd=chunk_dir) + run_git(['commit', '-m', 'Add lighttpd.morph'], cwd=chunk_dir) @contextlib.contextmanager def given_out_of_date_trove_instance(self, vm_name, fixture_dir, reuse=False): |