diff options
4 files changed, 5 insertions, 7 deletions
diff --git a/openstack_dashboard/dashboards/admin/metering/tests.py b/openstack_dashboard/dashboards/admin/metering/tests.py index f9e81f2e5..3a0794cbd 100644 --- a/openstack_dashboard/dashboards/admin/metering/tests.py +++ b/openstack_dashboard/dashboards/admin/metering/tests.py @@ -66,8 +66,7 @@ class MeteringViewTests(test.APITestCase, test.BaseAdminViewTests): api.keystone.tenant_list(IsA(http.HttpRequest), domain=None, - marker='tenant_marker', - paginate=True) \ + paginate=False) \ .AndReturn([self.tenants.list(), False]) ceilometerclient = self.stub_ceilometerclient() @@ -98,8 +97,7 @@ class MeteringViewTests(test.APITestCase, test.BaseAdminViewTests): api.keystone.tenant_list(IsA(http.HttpRequest), domain=None, - marker='tenant_marker', - paginate=True) \ + paginate=False) \ .AndReturn([self.tenants.list(), False]) ceilometerclient = self.stub_ceilometerclient() diff --git a/openstack_dashboard/dashboards/admin/metering/views.py b/openstack_dashboard/dashboards/admin/metering/views.py index b28b325d7..ad3e9e45e 100644 --- a/openstack_dashboard/dashboards/admin/metering/views.py +++ b/openstack_dashboard/dashboards/admin/metering/views.py @@ -145,8 +145,7 @@ class SamplesView(TemplateView): tenants, more = api.keystone.tenant_list( request, domain=None, - paginate=True, - marker="tenant_marker") + paginate=False) except Exception: tenants = [] exceptions.handle(request, diff --git a/openstack_dashboard/dashboards/project/images_and_snapshots/images/forms.py b/openstack_dashboard/dashboards/project/images_and_snapshots/images/forms.py index b5ec7d3ea..16c49b1e0 100644 --- a/openstack_dashboard/dashboards/project/images_and_snapshots/images/forms.py +++ b/openstack_dashboard/dashboards/project/images_and_snapshots/images/forms.py @@ -80,7 +80,7 @@ class CreateImageForm(forms.SelfHandlingForm): ' (no minimum).'), required=False) minimum_ram = forms.IntegerField(label=_("Minimum Ram (MB)"), - help_text=_('The minimum disk size' + help_text=_('The minimum memory size' ' required to boot the' ' image. If unspecified, this' ' value defaults to 0 (no' diff --git a/openstack_dashboard/test/helpers.py b/openstack_dashboard/test/helpers.py index c008002e8..75016e8d1 100644 --- a/openstack_dashboard/test/helpers.py +++ b/openstack_dashboard/test/helpers.py @@ -316,6 +316,7 @@ class APITestCase(TestCase): keystone_client.Client.service_catalog = None keystone_client.Client.tenant_id = '1' keystone_client.Client.tenant_name = 'tenant_1' + keystone_client.Client.management_url = "" self.keystoneclient = self.mox.CreateMock(keystone_client.Client) return self.keystoneclient |