Merge pull request #104 from willmtemple/bugfix-150729

Bugfix atomic mount command & incorrect test configuration
projectatomic · Jul 29, 2015 · ed96167 · ed96167
2 parents f1bde87 + 7e610b5
commit ed96167
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Atomic/mount.py b/Atomic/mount.py
@@ -418,7 +418,7 @@ def _unmount_devicemapper(self):
         dev = Mount.get_dev_at_mountpoint(self.mountpoint)
 
         dev_name = dev.replace('/dev/mapper/', '')
-        if not dev_name.startswith('docker-'):
+        if not dev_name.startswith(pool.rsplit('-', 1)[0]):
             raise MountError('Device mounted at {} is not a docker container.'
                              ''.format(self.mountpoint))
 

diff --git a/tests/integration/test_info.sh b/tests/integration/test_info.sh
@@ -12,8 +12,8 @@ validTest1 () {
 }
 
 TEST_1=`${ATOMIC} info atomic-test-1`
-TEST_RHEL_REMOTE=`${ATOMIC} info --remote rhel7:7.1-9`
-TEST_RHEL=`${ATOMIC} info rhel7:7.1-9`
+TEST_CENTOS_REMOTE=`${ATOMIC} info --remote centos:latest`
+TEST_CENTOS=`${ATOMIC} info centos:latest`
 
 set +e
 
@@ -23,7 +23,7 @@ set -e
 
 echo $TEST_1
 
-if [[ "${TEST_RHEL_REMOTE}" != "${TEST_RHEL}" ]]; then
+if [[ "${TEST_CENTOS_REMOTE}" != "${TEST_CENTOS}" ]]; then
     exit 1
 fi