Fix Nova test data and selenium tests

This patch squashes two commits, as the commit issues (broken tests)
were blocking each other.

Fix time in Nova test data

A recent update to python-novaclient seems to have highlighted some
incorrect test data, causing our tests to fail. This patch fixes the
time format.

Change-Id: I32a1e54205dd31176c0b7798597b63df544f8d38
Closes-Bug: 1567634
(cherry picked from commit d6afbac57f)

Fix Selenium Tests

A recent update to XStatic-Jasmine appears to have altered the class
name that a selenium test was looking for. This patch amends the class
so that the test correctly finds the class.

Change-Id: I8d6844cdb14a84bd5498429b8545cdca8ba173b6
Closes-Bug: 1567965
(cherry picked from commit 7661db1ba4)
This commit is contained in:
Rob Cresswell 2016-04-08 10:43:16 +01:00
parent 4fa0595078
commit fa00d7beb7
2 changed files with 3 additions and 3 deletions

View File

@ -24,7 +24,7 @@ class BrowserTests(test.SeleniumTestCase):
wait = self.ui.WebDriverWait(self.selenium, 30)
def jasmine_legacy_done(driver):
failures = driver.find_element_by_class_name("bar").text
failures = driver.find_element_by_class_name("jasmine-bar").text
return failures
self.assertTrue('0 failures' in wait.until(jasmine_legacy_done))

View File

@ -125,8 +125,8 @@ USAGE_DATA = """
"total_hours": 125.48222222222223,
"total_local_gb_usage": 0,
"tenant_id": "%(tenant_id)s",
"stop": "2012-01-31 23:59:59",
"start": "2012-01-01 00:00:00",
"stop": "2012-01-31T23:59:59.000000",
"start": "2012-01-01T00:00:00.000000",
"server_usages": [
{
"memory_mb": %(flavor_ram)s,