summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2014-02-17 10:24:43 +0000
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2014-02-17 10:24:43 +0000
commit3f9ac736b63e562b74f3b1ae4f67797ec9e547eb (patch)
tree9eb0e9bbc19c77841ee17083d7676a24b0bee54d
parent572953c81998fd889c6937ae2e138414089cc120 (diff)
downloadsystem-tests-3f9ac736b63e562b74f3b1ae4f67797ec9e547eb.tar.gz
Add can_push
-rwxr-xr-xtest.py33
1 files changed, 17 insertions, 16 deletions
diff --git a/test.py b/test.py
index dd7ad5e..a5117ee 100755
--- a/test.py
+++ b/test.py
@@ -63,19 +63,29 @@ def can_clone(vm_name, project, repo):
return success
+def can_push(vm_name, project, repo):
+ workspace_dir = tempfile.mkdtemp()
+ repodir = os.path.join(workspace_dir, repo)
-#def can_push(vm_name, project, repo, workspace_dir):
+ cloned = run_git_clone(vm_name, project, repo, workspace_dir)
-vm_name = 'ct-ri-4'
-workspace_dir = tempfile.mkdtemp()
+ with open(os.path.join(workspace_dir, repo, filename), 'w') as f:
+ f.write('A test file')
+
+ added = run_git(['add', filename], repodir)
+ committed = run_git(['commit', '-m', 'Add a test file'], repodir)
+
+ pushed = run_git(['push', 'origin', 'master'], repodir)
+
+ shutil.rmtree(workspace_dir)
-print 'Created temporary workspace in', workspace_dir
+ return cloned + added + committed + pushed == 0
+
+vm_name = 'ct-ri-4'
project = 'test-proj'
repo = 'test-repo'
filename = 'test-file'
-repodir = os.path.join(workspace_dir, repo)
-
remote_url = 'git@' + vm_name
create_test_project(remote_url, project)
@@ -83,13 +93,4 @@ create_test_repo(remote_url, project, repo)
# We should be able to clone
cloned = can_clone(vm_name, project, repo)
-#pushed = can_push()
-
-#with open(os.path.join(workspace_dir, repo, filename), 'w') as f:
-# f.write('A test file')
-
-#run_git(['add', filename], repodir)
-#run_git(['commit', '-m', 'Add a test file'], repodir)
-#run_git(['push', 'origin', 'master'], repodir)
-
-shutil.rmtree(workspace_dir) \ No newline at end of file
+pushed = can_push(vm_name, project, repo)