archive/blender-asset-manager
Archived
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mistake in last commit. also better asserts when setUp fails

Browse Source
This commit is contained in:
Campbell Barton
2014-11-20 11:54:33 +01:00
parent e256506bf1
commit d0491344db
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/test_cli.py
View File

@@ -185,23 +185,21 @@ class StdIO:
def svn_repo_create(id_, dirname): def svn_repo_create(id_, dirname):
return run_check(["svnadmin", "create", id_], cwd=dirname)[2] return run_check(["svnadmin", "create", id_], cwd=dirname)
def svn_repo_checkout(repo, path): def svn_repo_checkout(repo, path):
return run_check(["svn", "checkout", repo, path])[2] return run_check(["svn", "checkout", repo, path])
def svn_repo_populate(path): def svn_repo_populate(path):
dummy_file = os.path.join(path, "file1") dummy_file = os.path.join(path, "file1")
file_quick_touch(path) file_quick_touch(path)
returncode = run(["svn", "add", dummy_file])[2] if not run_check(["svn", "add", dummy_file]):
if (returncode != 0):
return False return False
returncode = run(["svn", "commit", "-m", "First commit"])[2] if not run_check(["svn", "commit", "-m", "First commit"]):
if (returncode != 0):
return False return False
return True return True
@@ -385,18 +383,20 @@ class BamSessionTestCase(unittest.TestCase):
os.makedirs(path_svn_repo) os.makedirs(path_svn_repo)
# Create a fresh SVN repository # Create a fresh SVN repository
svn_repo_create(self.proj_name, path_svn_repo) if not svn_repo_create(self.proj_name, path_svn_repo):
self.fail("svn_repo: create")
# Check for SVN checkout # Check for SVN checkout
path_svn_checkout = os.path.join(self.path_remote_store, "svn_checkout") path_svn_checkout = os.path.join(self.path_remote_store, "svn_checkout")
# Create an SVN checkout of the freshly created repo # Create an SVN checkout of the freshly created repo
if not svn_repo_checkout("file://%s" % os.path.join(path_svn_repo, self.proj_name), path_svn_checkout): path_svn_repo_url = "file://%s" % os.path.join(path_svn_repo, self.proj_name)
self.fail() if not svn_repo_checkout(path_svn_repo_url, path_svn_checkout):
self.fail("svn_repo: checkout %r" % path_svn_repo_url)
# Populate the repo with an empty file # Populate the repo with an empty file
if not svn_repo_populate(os.path.join(path_svn_checkout, self.proj_name)): if not svn_repo_populate(os.path.join(path_svn_checkout, self.proj_name)):
self.fail() self.fail("svn_repo: populate")
def tearDown(self): def tearDown(self):
# input('Wait:') # input('Wait:')