try again

Arrowbox · Aug 11, 2016 · c9c92b4 · c9c92b4
1 parent 24d230d
commit c9c92b4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/conda/lock.py b/conda/lock.py
@@ -112,10 +112,10 @@ def __init__(self, directory_path, retries=10):
         # e.g. if locking directory `/conda`, lock file will be `/conda/conda.pidXXXX.conda_lock`
         self.lock_file_glob_str = "%s.pid*.%s" % (lock_path_pre, LOCK_EXTENSION)
         assert isdir(dirname(self.directory_path)), "{0} doesn't exist".format(self.directory_path)
-        assert os.access(self.directory_path, os.W_OK), "%s not writable" % self.directory_path
         if not isdir(self.directory_path):
             os.makedirs(self.directory_path, exist_ok=True)
             log.debug("forced to create %s", self.directory_path)
+        assert os.access(self.directory_path, os.W_OK), "%s not writable" % self.directory_path
 
 
 Locked = DirectoryLock
diff --git a/utils/travis-run-script.sh b/utils/travis-run-script.sh
@@ -20,7 +20,7 @@ flake8_test() {
     python -m flake8 --statistics
 }
 
-conda_build_test() {
+conda_build_smoke_test() {
     python setup.py install
     conda install -y -q jinja2 patchelf
     pip install git+https://github.com/conda/conda-build.git@$CONDA_BUILD
@@ -29,14 +29,24 @@ conda_build_test() {
     conda build conda.recipe
 }
 
+conda_build_unit_test() {
+    git clone -b $CONDA_BUILD --single-branch --depth 1000 https://github.com/conda/conda-build.git
+    pushd conda-build
+    python setup.py install
+    conda install -y -q pytest pytest-cov mock anaconda-client
+    python -m pytest tests
+}
 
 which -a python
 env | sort
 
 if [[ $FLAKE8 == true ]]; then
     flake8_test
 elif [[ -n $CONDA_BUILD ]]; then
-    conda_build_test
+    conda_build_smoke_test
+    if [[ $CONDA_BUILD == 1.21.11 ]]; then
+        conda_build_unit_test
+    fi
 else
     main_test
 fi