Fixing delete backup

- Backup is not able to be delete because the object is not found in swift
- Issue is that the filename parsing is incorrect

fixes bug # 1186454

Change-Id: I0195aa72bf42a3d87d7e6c541655b172cae7f195
This commit is contained in:
Steve Leon 2013-06-03 09:51:37 -07:00
parent 68a39d088a
commit 187756d4b8
2 changed files with 8 additions and 2 deletions

View File

@ -210,6 +210,6 @@ class DBBackup(DatabaseModelBase):
last_slash = self.location.rfind("/")
if last_slash < 0:
raise ValueError("Bad location for backup object.")
return self.location[last_slash + 1]
return self.location[last_slash + 1:]
else:
return None

View File

@ -32,6 +32,8 @@ BACKUP_NAME = 'WORKS'
BACKUP_NAME_2 = 'IT-WORKS'
BACKUP_STATE = "NEW"
BACKUP_DESC = 'Backup test'
BACKUP_FILENAME = '45a3d8cb-ade8-484c-a8a5-0c3c7286fb2f.xbstream.gz'
BACKUP_LOCATION = 'https://hpcs.com/tenant/database_backups/' + BACKUP_FILENAME
class BackupCreateTest(testtools.TestCase):
@ -137,7 +139,8 @@ class BackupORMTest(testtools.TestCase):
name=BACKUP_NAME,
state=BACKUP_STATE,
instance_id=self.instance_id,
deleted=False)
deleted=False,
location=BACKUP_LOCATION)
self.deleted = False
def tearDown(self):
@ -202,3 +205,6 @@ class BackupORMTest(testtools.TestCase):
def test_deleted_not_running(self):
self.backup.delete()
self.assertFalse(models.Backup.running(self.instance_id))
def test_filename(self):
self.assertEqual(BACKUP_FILENAME, self.backup.filename)